Merge remote-tracking branch 'origin/master'
authorGeorgios Gousios <gousiosg@gmail.com>
Thu, 16 Feb 2012 10:49:57 +0000 (12:49 +0200)
committerGeorgios Gousios <gousiosg@gmail.com>
Thu, 16 Feb 2012 10:49:57 +0000 (12:49 +0200)
commitf8c4d57c3a65542d860816d0211c3b4fde73c86b
tree6f42203f79e9702d9d25f031a31c95c0a25962f1
parentbfd0f0a792dcdfdfa713ab559526c2b8cf0d8be3
parent3311d5fe4750155501a8b6cfbe36b589d0afea29
Merge remote-tracking branch 'origin/master'

Conflicts:
src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala
src/main/scala/gr/grnet/aquarium/logic/accounting/Accounting.scala