git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc1057d bf8ddd5)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorroot <root@Portable>
Mon, 14 Apr 2014 09:50:12 +0000 (11:50 +0200)
committerroot <root@Portable>
Mon, 14 Apr 2014 09:50:12 +0000 (11:50 +0200)

Trivial merge
myslice (django)