Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorPeter Schulgin <peter.schulgin@opendynamic.de>
Mon, 6 Jan 2014 10:34:52 +0000 (11:34 +0100)
committerPeter Schulgin <peter.schulgin@opendynamic.de>
Mon, 6 Jan 2014 10:34:52 +0000 (11:34 +0100)
commit09e653517a73f8df4992a12dd0f995b72abe9977
tree10d289f7164cc12b89ae133cbff557115e41a161
parent67b9c398c20060b6fc0ca5eec8e63f1a263571bf
parent0c31c55d2a8ff03f2d6252d7a6cd1f4fded5ec12
Merge branch 'master' of github.com:kivitendo/kivitendo-erp