Merge branch 'controller'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 15:34:50 +0000 (16:34 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 15:34:50 +0000 (16:34 +0100)

Trivial merge