BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2fb13c4 38bd59b)
Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 10:06:40 +0000 (12:06 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 10:06:40 +0000 (12:06 +0200)

Trivial merge