]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e28814e 3510fcf)
Merge remote-tracking branch 'upstream/v2.5' into CSPACE-5405
authorRick Jaffe <rjaffe@berkeley.edu>
Fri, 20 Jul 2012 01:24:55 +0000 (18:24 -0700)
committerRick Jaffe <rjaffe@berkeley.edu>
Fri, 20 Jul 2012 01:24:55 +0000 (18:24 -0700)

Trivial merge