Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 15 Jan 2014 14:00:10 +0000 (15:00 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 15 Jan 2014 14:00:10 +0000 (15:00 +0100)
commit0448fc15357e20ffb74e08f2a8459820494a6eef
tree87083f7ef8f76b5eee53d5d79f481209313ed1e1
parent53fcb212544cf90957c5e6a3b3a1a36af395b273
parent8a190e3d53337ef1f4941fbc25ef1b16229f3d67
Merge branch 'master' of github.com:kivitendo/kivitendo-erp