Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Tue, 24 May 2011 14:19:15 +0000 (10:19 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Tue, 24 May 2011 14:19:15 +0000 (10:19 -0400)
commit658b52f57751e4cd1e68ad4797babe8b573ea53c
tree4585284fd8580fcf2cc0948641fc6f20f2ed0758
parente432ca57e7d6fe664a84cfe0e0ace5ac5c1eed46
parent0949c0a89a9dd39f7f751ed98d1c33a37f3b0cc9
Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook