Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Mon, 6 Jan 2014 14:59:30 +0000 (15:59 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Mon, 6 Jan 2014 14:59:30 +0000 (15:59 +0100)
commit1915baafebf49798f24283bb261e11c739e3e322
treeff296d3e550159b355c8bb74359246b616051263
parent6c424971ac668812e6ca22f25e02e25a70d7f167
parentc65e0af9ad9735073fcbce56100fa81712b75659
Merge branch 'master' of github.com:kivitendo/kivitendo-erp