Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ttopac
authorevergreen <evergreen@squeeze.debian>
Tue, 28 Jun 2011 15:08:51 +0000 (11:08 -0400)
committerevergreen <evergreen@squeeze.debian>
Tue, 28 Jun 2011 15:08:51 +0000 (11:08 -0400)
1  2 
Open-ILS/examples/fm_IDL.xml

Simple merge