Code

Merged branch 'experimental' into debmon-wheezy.
authorSebastian Harl <sh@teamix.net>
Wed, 28 Nov 2012 11:46:13 +0000 (12:46 +0100)
committerSebastian Harl <sh@teamix.net>
Wed, 28 Nov 2012 11:46:13 +0000 (12:46 +0100)

Trivial merge