Merge branch 'master' into full-month-stats
authorMaxim Mamontov <faust.madf@gmail.com>
Mon, 20 Jun 2011 12:28:24 +0000 (15:28 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Mon, 20 Jun 2011 12:28:24 +0000 (15:28 +0300)

Trivial merge