Merge branch 'master' into tmp_master_merger
authorChristos KK Loverdos <loverdos@gmail.com>
Thu, 1 Mar 2012 15:29:45 +0000 (17:29 +0200)
committerChristos KK Loverdos <loverdos@gmail.com>
Thu, 1 Mar 2012 15:29:45 +0000 (17:29 +0200)
commitce05d989990bcf1e8c392bfe1fae06d611e42dbf
tree54ca02228311300d82d41151b2b90bb93cba97a9
parent2cf6ae446070dd613c30e8e108af9f6356e80dc2
parent3d129472bb5cd6943b7fdd61124e987989748905
Merge branch 'master' into tmp_master_merger

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