Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_plux
authorPeter Lux <plux@upei.ca>
Fri, 9 Dec 2011 21:13:58 +0000 (16:13 -0500)
committerPeter Lux <plux@upei.ca>
Fri, 9 Dec 2011 21:13:58 +0000 (16:13 -0500)
commit5c507e26734223812342f6fa61c1f8b56ed403f4
tree4ba7aca88f483a3c16dc957aaeb7bff3e428f75a
parentf46d754bdea91dbdfa16b19a5025e53c0794e6f1
parentdef53e4743953d0ad50f24f52145d8db5da85b58
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_plux