BGBM BDI Projects / cdmlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12ce88f 76bdab2)
Merge branch 'master' into develop
authorjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 12:00:46 +0000 (14:00 +0200)
committerjenkins <jenkins@160.45.63.201>
Wed, 15 Jul 2015 12:00:46 +0000 (14:00 +0200)

Trivial merge