git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 350a5ff bcfbfc5)
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 10 Sep 2014 15:40:15 +0000 (17:40 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 10 Sep 2014 15:40:15 +0000 (17:40 +0200)
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.


Trivial merge
sfa