Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 20 Dec 2013 10:52:44 +0000 (11:52 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 20 Dec 2013 10:52:44 +0000 (11:52 +0100)
commit08c79c2c65b17701c1f42d9a2b4623d7bd806120
tree61401cbe6aaba729475d54e3fb50aad638a9077d
parent19064edf6bd7859e831fdf37cd465f7f933be6f3
parent2a3bcd6e2e1adee31dff01f4f18086a536998a3c
Merge branch 'master' of github.com:kivitendo/kivitendo-erp