Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 17:59:33 +0000 (18:59 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 17:59:33 +0000 (18:59 +0100)
commit56911d6832f011555add955dc905e6e72ac2db65
tree5368f3c9e2e546654a362cb3e289b6709eb38a1b
parent71a0f6e96621c680d5c592d57aedd5b450bea3f1
parent976c74f1c44e1f8cbd8edee5a3e78cd7079b1dc6
Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp