]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a6cdcc 3e7b6e7)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormorsch <andreas.morsch@cern.ch>
Tue, 3 Jun 2014 15:25:12 +0000 (17:25 +0200)
committermorsch <andreas.morsch@cern.ch>
Tue, 3 Jun 2014 15:25:12 +0000 (17:25 +0200)

Trivial merge