Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
authorroot <root@dev84.dev.grnet.gr>
Tue, 2 Oct 2012 09:06:14 +0000 (12:06 +0300)
committerroot <root@dev84.dev.grnet.gr>
Tue, 2 Oct 2012 09:06:14 +0000 (12:06 +0300)
commit28c06e759be8794020f9123eaeaac6123fa62ffb
tree36402e194b56b1fd1634b76e5db656000086e53f
parentd129db21120d052bf131b5716bf31dbd4e41efc1
parent3bb604eb1a611dcf4cdf806ab310849674e9d3e2
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py