projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e0026a 80c12c4)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into patron_no_collections2
authorMike Rylander <mrylander@gmail.com>
Thu, 2 Jun 2011 14:33:35 +0000 (10:33 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 2 Jun 2011 14:49:02 +0000 (10:49 -0400)
Signed-off-by: Mike Rylander <mrylander@gmail.com>

Trivial merge
Evergreen contribs