Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 13 Jan 2014 16:20:22 +0000 (17:20 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 13 Jan 2014 16:20:22 +0000 (17:20 +0100)
commit6f6f2fd87e08cbe2d1b599b064823f499a7f910f
treeecc9e54b1cc88cdf6031c1f6f0b2c95184cb8729
parent5a6fba9dc4dc06a3a6ad063266a0f05cd45ab1c5
parent3a442e98d0ea275d19d056672e8ccc7c8829e6ac
Merge branch 'master' of github.com:kivitendo/kivitendo-erp