git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44988f0 6a9a42d)
Merge commit 'local_master/master'
authorroot <root@cassidy.cs.princeton.edu>
Wed, 26 Jan 2011 22:15:23 +0000 (17:15 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Wed, 26 Jan 2011 22:15:23 +0000 (17:15 -0500)

Trivial merge
build