projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b51b19 b8b6306)
Merge branch 'rel_2_0' of git.evergreen-ils.org:/Evergreen into new_rel20 rel_2_0
authorDan Scott <dscott@laurentian.ca>
Thu, 29 Dec 2011 17:47:37 +0000 (12:47 -0500)
committerDan Scott <dscott@laurentian.ca>
Thu, 29 Dec 2011 17:47:37 +0000 (12:47 -0500)
Conflicts:
README

Signed-off-by: Dan Scott <dscott@laurentian.ca>

Trivial merge
Evergreen contribs