Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 12 Mar 2013 12:00:03 +0000 (13:00 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 12 Mar 2013 12:00:03 +0000 (13:00 +0100)

Trivial merge