Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 14:15:13 +0000 (15:15 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Mon, 6 Jan 2014 14:15:13 +0000 (15:15 +0100)
commitbfd8b7a229bf1bec0a6ed2c2e8a76d6cab30704a
tree06290552c65e8c3fab5c1d23ea61b692433ee4c4
parent3a24478925cbb65bbcd6f54fa19c272c684fcdad
parent17a24be3b58e37945b47dbd35176c0dc1c067fb4
Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp