Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 23 Jan 2015 14:03:10 +0000 (15:03 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 23 Jan 2015 14:03:10 +0000 (15:03 +0100)
commit38f974a2140303118c2241ba95bde1703be5a237
treea3a2a50530acba31c3c8641e2c30890ec2366ce2
parentf0ad214336550a429014c0e496511dada80be935
parent4bd3d0f3af4c2398220755bbe9392ff89b4d2bcd
Merge branch 'master' of github.com:kivitendo/kivitendo-erp