Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 30 Jan 2015 14:32:28 +0000 (15:32 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 30 Jan 2015 14:32:28 +0000 (15:32 +0100)
commitfcade7254d366eb6483b5640947589d989f01c95
treeb16e9f06d66b78dbbbc578d3f40dd43ebfd299e6
parent383c0ee3456d9cb9e00d0610cc9f0843c8b1ece9
parent9d113c3faeeb38fa9d077c7c37fe41c94e782c14
Merge branch 'master' of github.com:kivitendo/kivitendo-erp