Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into destdir
authorBen Webb <bjwebb67@googlemail.com>
Tue, 12 Jul 2011 17:05:13 +0000 (18:05 +0100)
committerBen Webb <bjwebb67@googlemail.com>
Tue, 12 Jul 2011 17:05:13 +0000 (18:05 +0100)

Trivial merge