projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c335dd4 d6f8124)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 14:18:47 +0000 (10:18 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 14:18:47 +0000 (10:18 -0400)

Trivial merge
Evergreen with Equinox developments in process and local tweaks