Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 7 Jan 2014 17:13:39 +0000 (18:13 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 7 Jan 2014 17:13:39 +0000 (18:13 +0100)
commit9bfde8af91ac295afb6e68b8580f000fd6051f15
tree352a28ea4ec7cfe21138aa868231d648efd4cefe
parentf46afb13bacfe1d838cb4a7a5b5b58e8145ff4b1
parent188734cee4672fe7421293f7af68fa3734e52064
Merge branch 'master' of github.com:kivitendo/kivitendo-erp