| commit | 037ba69bced119de1618526e6977940908eeb7bc | [log] [tgz] |
|---|---|---|
| author | imod <domi@fortysix.ch> | Fri Jul 18 18:18:49 2014 +0200 |
| committer | imod <domi@fortysix.ch> | Fri Jul 18 18:18:49 2014 +0200 |
| tree | f04de69ab43b30d4bc0880e24cf4181b28ec92a2 | |
| parent | abea2d9c8ba464c088e6420fb64554f205c463ea [diff] | |
| parent | e669c9a0bfd215bfd72a29fc7e9b12cc9f7c0117 [diff] |
Merge branch 'SCM-765' # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.