Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 15 Jan 2014 12:15:59 +0000 (13:15 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 15 Jan 2014 12:15:59 +0000 (13:15 +0100)
commit8a190e3d53337ef1f4941fbc25ef1b16229f3d67
tree5f5a2951531e71ee49e479b3c0d44d85ff0a2a66
parenta31ce8afd1c05d8ac178a84660f10068359dc5ad
parent16b7cb9b3cc58b852adbd09e628b96b47062b5b1
Merge branch 'master' of github.com:kivitendo/kivitendo-erp