projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 287c249 ab38f00)
Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorMike Rylander <mrylander@gmail.com>
Tue, 10 Jan 2012 20:11:07 +0000 (15:11 -0500)
committerMike Rylander <mrylander@gmail.com>
Tue, 10 Jan 2012 20:11:07 +0000 (15:11 -0500)

Trivial merge
Evergreen contribs