projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8bb847 8893e1c)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 15:12:40 +0000 (11:12 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 15:12:40 +0000 (11:12 -0400)

Trivial merge
Evergreen with Equinox developments in process and local tweaks