Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jan 2014 09:52:30 +0000 (10:52 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 23 Jan 2014 09:52:30 +0000 (10:52 +0100)
commit846a322f70e71c5d0338f13eeea842d0f87c5ae3
tree631a71e1d269c80a210dc805aaeb54f2ba6cf69a
parent7b672f1f5400d0fa187e593508dd052ee580d006
parent738e3a611167c1b799b5257547d0e89a179dc5e1
Merge branch 'master' of github.com:kivitendo/kivitendo-erp