projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 604f94f 4abc3d7)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:41:10 +0000 (12:41 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:41:10 +0000 (12:41 -0400)

Trivial merge
Evergreen with Equinox developments in process and local tweaks