Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 18:18:41 +0000 (19:18 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 18:18:41 +0000 (19:18 +0100)
commita3f5ca64363e68adb11dfc93672b8786cd31801f
tree3c0f43ea5cef825d715c75532910dee1ec9efe9d
parent79d876f9797e2c8693d9cc88f7e18afb1fadba4d
parent24cc5f2baffdb1fd52acb76e8d73be3e694b1737
Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp