git://git.onelab.eu / nepi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc5a7e8 497b7be)
Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 25 May 2011 15:48:27 +0000 (17:48 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 25 May 2011 15:48:27 +0000 (17:48 +0200)

Trivial merge
nepi