]> 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: 85b5657 672432f)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfbock <friederike.bock@cern.ch>
Wed, 11 Jun 2014 11:55:12 +0000 (13:55 +0200)
committerfbock <friederike.bock@cern.ch>
Wed, 11 Jun 2014 11:55:12 +0000 (13:55 +0200)

Trivial merge