git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4bbf37 6ff4307)
Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 14:10:18 +0000 (09:10 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 14:10:18 +0000 (09:10 -0500)

Trivial merge
build