Merge branch 'current_changes' astakos/v0.4.0
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 4 Apr 2012 11:48:45 +0000 (14:48 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 4 Apr 2012 11:48:45 +0000 (14:48 +0300)
commit0441fe7f48fddb6de263aa22f39ce1a15345083b
tree600b4e157dbe2b787e83dcfbaa0fe653cccb9589
parent3b011c483c1a3c04786883a8ae68d23e11bbfd81
parentafd0710ee52cb04da679687573f60b181b0bc0e4
Merge branch 'current_changes'

Conflicts:
snf-astakos-app/Changelog
snf-astakos-app/Changelog