git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa20418 d044464)
Merge remote-tracking branch 'origin/master'
authorGit User <support@planet-lab.org>
Thu, 7 Jun 2012 08:21:32 +0000 (04:21 -0400)
committerGit User <support@planet-lab.org>
Thu, 7 Jun 2012 08:21:32 +0000 (04:21 -0400)
1  2 
sfa.spec patch | diff1 | diff2 | blob | history

diff --cc sfa.spec
Simple merge
sfa