]> 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: 6720a01 5a5f51e)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorjbook <jbook>
Wed, 22 Jan 2014 22:20:29 +0000 (23:20 +0100)
committerjbook <jbook@cern.ch>
Wed, 22 Jan 2014 22:20:29 +0000 (23:20 +0100)

Trivial merge