tree 2e0987c922008a01ed97d85f2f2e6ee76ed8dc7d
parent 300408fe329e2a3d65947c6071f77959986685b1
parent f8cca195532f947aa5921e9f48539ba29254d55e
author genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1372308304 -0700
committer genia.likes.science@gmail.com <genia.likes.science@gmail.com> 1372308304 -0700

Merge branch 'eugenia/asterix_sdk_stable' into eugenia/black_cherry_stable

Conflicts:
	asterix-app/src/main/resources/sdk/static/js/asterix-sdk-stable.js