]> 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: 2dcb6c6 3effe27)
Merge branch 'master' of github.com:collectionspace/services
authorRichard Millet <remillet@berkeley.edu>
Thu, 21 Jun 2012 22:38:26 +0000 (15:38 -0700)
committerRichard Millet <remillet@berkeley.edu>
Thu, 21 Jun 2012 22:38:26 +0000 (15:38 -0700)

Trivial merge