Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 29 Apr 2013 11:16:48 +0000 (13:16 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 29 Apr 2013 11:16:48 +0000 (13:16 +0200)
commitf5c9c5eba0aed77f5cebe2e5cee5c7f3743b579e
tree3099609449b3e4f3ed472562d3317454e2da207a
parent3f4f01dcd306d7ebb51a1186d722e6aecd237003
parentc5651754689f5072d6f9896af9c85312128d6e18
Merge branch 'master' of github.com:kivitendo/kivitendo-erp