Merge branch 'master' of https://code.grnet.gr/git/astakos
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 2 Feb 2012 13:50:58 +0000 (15:50 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 2 Feb 2012 13:50:58 +0000 (15:50 +0200)
commit4ded18d1b44036191bcad87e53ff2e472f494723
tree21a519c161d528ece44e901349346e0c7832aa1c
parentf7e8a159bb7e592fc4327b42dd9315cabd828cc1
parent77e2ad52e5c8893c6195ece5fa761fff9b0a5fed
Merge branch 'master' of https://code.grnet.gr/git/astakos
astakos/im/views.py