git://git.onelab.eu / nepi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d02be4 76ef9f2)
Merging opt-3.1 into nepi-3-dev
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Mon, 28 Jul 2014 09:10:48 +0000 (11:10 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Mon, 28 Jul 2014 09:10:48 +0000 (11:10 +0200)

Trivial merge
nepi