Merge branch 'master' into 1852_billing_period_calc
authorChristos KK Loverdos <loverdos@gmail.com>
Mon, 30 Jan 2012 13:36:33 +0000 (15:36 +0200)
committerChristos KK Loverdos <loverdos@gmail.com>
Mon, 30 Jan 2012 13:36:33 +0000 (15:36 +0200)

Trivial merge