Merge branch 'ui_refactoring' of git@gitorious.org:msoma/msoma.git into ui_refactoring
authorLorenzo Bettini <lorenzo.bettini@gmail.com>
Fri, 9 Jul 2010 14:17:59 +0000 (16:17 +0200)
committerLorenzo Bettini <lorenzo.bettini@gmail.com>
Fri, 9 Jul 2010 14:17:59 +0000 (16:17 +0200)
commit58e295bb806b7083b1f8f4b4b57eb80116a86f98
tree2ef90809a1d787c763e54796dda443707c7e597c
parente2928ea8c7c35050d5be54b192968963f1e7083b
parent98b72f69a677e3d6c6f26394a4ef6da2a613f6ca
Merge branch 'ui_refactoring' of git@gitorious.org:msoma/msoma.git into ui_refactoring

Conflicts:
msoma/TODO