Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Mon, 11 Jul 2011 20:16:21 +0000 (16:16 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 11 Jul 2011 20:16:21 +0000 (16:16 -0400)
1  2 
Open-ILS/examples/fm_IDL.xml

Simple merge