Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 16 Jan 2014 15:17:46 +0000 (16:17 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 16 Jan 2014 15:17:46 +0000 (16:17 +0100)
commit4ad83535d690476c4d279eb57741612835a3bc60
tree0e7dfbedbbf1af03a83364ac0128a1306567cdb9
parentd0118dc6303e04507a77f3dde2c2bf0565ecb388
parentf796ed261b3ba8503a8bd9f2d9b7effed12355c7
Merge branch 'master' of github.com:kivitendo/kivitendo-erp