projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 764d28f 448bfcc)
Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorGalen Charlton <gmc@esilibrary.com>
Mon, 16 May 2011 17:29:32 +0000 (13:29 -0400)
committerGalen Charlton <gmc@esilibrary.com>
Mon, 16 May 2011 17:29:32 +0000 (13:29 -0400)

Trivial merge
Evergreen with Equinox developments in process and local tweaks