From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 23 Jun 2010 10:29:00 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/playground
X-Git-Tag: out-of-band~8
X-Git-Url: http://git.onelab.eu/?p=playground.git;a=commitdiff_plain;h=b09ff99a72d7378c8daefcc5115719ff3f687995

Merge branch 'master' of ssh://git.onelab.eu/git/playground
---

b09ff99a72d7378c8daefcc5115719ff3f687995
diff --cc orange.txt
index ebb6d70,257cc56..99ff497
--- a/orange.txt
+++ b/orange.txt
@@@ -1,5 -1,1 +1,2 @@@
- trying out the email-with-diffs feature
- trying out the email-with-diffs (2)
- bar
  foo
 +moving to git@onelab.eu