Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 6 Feb 2013 12:10:47 +0000 (13:10 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 6 Feb 2013 12:10:47 +0000 (13:10 +0100)
commit7c9fc25b6893a1ea508185a0f1a197d6b46f187a
tree0080b2fa455a57feacbbbd6fbfa19332b3e55380
parent61813c8cae20d175297c00bdcdb4ff986d144c62
parent4f70967e7a5df312c140bdf3afde074fa72ff2ea
Merge branch 'master' of github.com:kivitendo/kivitendo-erp