Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorG. Richardson <information@kivitendo-premium.de>
Mon, 6 Jan 2014 18:19:44 +0000 (19:19 +0100)
committerG. Richardson <information@kivitendo-premium.de>
Mon, 6 Jan 2014 18:19:44 +0000 (19:19 +0100)
commit54332c039c95abce0607e3c1714254b18f0b32bd
treeb6dced71a67f3cf302412eb468b7b88a458115b7
parent2b36e231155cdc8d2cc4c0fe2b515237bf40bf45
parenta3f5ca64363e68adb11dfc93672b8786cd31801f
Merge branch 'master' of github.com:kivitendo/kivitendo-erp