Merge branch 'master' of git.evergreen-ils.org:Evergreen into social
authorMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:21:22 +0000 (12:21 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:21:22 +0000 (12:21 -0400)

Trivial merge