]> 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: 7b4f711 506b647)
Merge branch 'v2.5' of github.com:collectionspace/services into v2.5
authorRichard Millet <remillet@berkeley.edu>
Tue, 24 Jul 2012 01:20:57 +0000 (18:20 -0700)
committerRichard Millet <remillet@berkeley.edu>
Tue, 24 Jul 2012 01:20:57 +0000 (18:20 -0700)

Trivial merge