Merge remote-tracking branch 'refs/remotes/gerrit/pu/cal2012'
authorCornelius Weiß <mail@corneliusweiss.de>
Wed, 12 Sep 2012 15:05:29 +0000 (17:05 +0200)
committerCornelius Weiß <mail@corneliusweiss.de>
Wed, 12 Sep 2012 15:05:29 +0000 (17:05 +0200)

Trivial merge