Merge branch 'master'
authorChristos KK Loverdos <loverdos@gmail.com>
Thu, 20 Sep 2012 12:46:57 +0000 (15:46 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Thu, 20 Sep 2012 12:46:57 +0000 (15:46 +0300)
commitaf0281d1d075dc0125733cee6135cee7b1527403
treef19af8fbe8645017de3f7e7ba795b85fe9f82304
parentb51dbda9a7c0a9c803cb331dd4eae4c054533de5
parent946e3a9be50e0a04c92afd8acd5304d9dcd9496b
Merge branch 'master'

Conflicts:
src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala