projects / contrib / Conifer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5368270644e6a229f0f62f924d488c937398f024
treecd4b4691a80384348920d94e2b55761947e08244tree
parent2b51b191b5dfc187764e1b2d6a54fa1ac3b5e498commit | diff
parentb8b6306466d711373571f28a66727d87f9961320commit | diff
Merge branch 'rel_2_0' of git.evergreen-ils.org:/Evergreen into new_rel20

Conflicts:
README

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