Merge branch 'master' of git://git.evergreen-ils.org/Evergreen_Website
authorAnoop Atre <aatre@esilibrary.com>
Thu, 21 Mar 2013 22:45:20 +0000 (18:45 -0400)
committerAnoop Atre <aatre@esilibrary.com>
Thu, 21 Mar 2013 22:45:20 +0000 (18:45 -0400)

Trivial merge