Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 16 Jan 2014 14:37:53 +0000 (15:37 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 16 Jan 2014 14:37:53 +0000 (15:37 +0100)
commitf796ed261b3ba8503a8bd9f2d9b7effed12355c7
tree5cfdbc092bac5ca3431269d591ffe0af758b5311
parentfab47672ea774d7218190a2a536876727be5a5de
parent9ea9e4eecc964611216f199a4210c12ba7fe8235
Merge branch 'master' of github.com:kivitendo/kivitendo-erp