Merge branch 'master' of https://code.grnet.gr/git/astakos
authorAntony Chazapis <chazapis@gmail.com>
Thu, 23 Feb 2012 11:24:51 +0000 (13:24 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Thu, 23 Feb 2012 11:24:51 +0000 (13:24 +0200)
commit5a6f91fcd4c0baf590996f80f9c82607d5959c6b
tree0ff6fa6014ab2fa35b8c7d1720595cbf5457337b
parentca34523e99c6df0fdaed086372f15df2da978aa8
parente5396d5e50eda8d1fedaf6cf2d8a5c3dd7503044
Merge branch 'master' of https://code.grnet.gr/git/astakos

Conflicts:
astakos/im/util.py