Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 30 Jan 2013 12:22:56 +0000 (13:22 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 30 Jan 2013 12:22:56 +0000 (13:22 +0100)

Trivial merge