projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21756d8 badc075)
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMartin Helmling <MartinHelmling@octo-soft.de>
Mon, 6 Jan 2014 10:49:02 +0000 (11:49 +0100)
committerMartin Helmling <MartinHelmling@octo-soft.de>
Mon, 6 Jan 2014 10:49:02 +0000 (11:49 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.