Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into android
authordrizea <danielrizea27@gmail.com>
Sat, 9 Mar 2013 12:06:50 +0000 (14:06 +0200)
committerdrizea <danielrizea27@gmail.com>
Sat, 9 Mar 2013 12:06:50 +0000 (14:06 +0200)

Trivial merge