Merge branch 'master' into 1852_billing_period_calc
authorChristos KK Loverdos <loverdos@gmail.com>
Tue, 31 Jan 2012 11:59:04 +0000 (13:59 +0200)
committerChristos KK Loverdos <loverdos@gmail.com>
Tue, 31 Jan 2012 11:59:04 +0000 (13:59 +0200)

Trivial merge