Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 15 Mar 2013 09:29:40 +0000 (10:29 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Fri, 15 Mar 2013 09:29:40 +0000 (10:29 +0100)
commitcd73950c9f7616255cf917e36a6e1a03627f860d
treed96fe7291365c2b8920115f0c635889d46d734b8
parent94ee5a7f5deddb1bf33855681c7a88dacaae2a11
parent42f6982878df79b835d4a7d63b4e4eac502d55e9
Merge branch 'master' of github.com:kivitendo/kivitendo-erp