Merge branch 'master' into full-month-stats
authorMaxim Mamontov <faust.madf@gmail.com>
Mon, 6 Feb 2012 08:48:45 +0000 (10:48 +0200)
committerMaxim Mamontov <faust.madf@gmail.com>
Mon, 6 Feb 2012 08:48:45 +0000 (10:48 +0200)

Trivial merge