git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42b767c ddf0f33)
Merge branch 'master' of git.onelab.eu:/git/myslice myslice-0.2-4
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 16:35:11 +0000 (18:35 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 16:35:11 +0000 (18:35 +0200)

Trivial merge
myslice (django)