Merge branch 'master' of git.evergreen-ils.org:Evergreen into SIP23738 SIP23738
authorMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 20:06:01 +0000 (16:06 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 20:06:01 +0000 (16:06 -0400)
commit0f92cb8e8c476c3c4aef03a7fa51e6ddd413360e
tree69729163c5f06b5737a566df9524a70cfc479f6b
parent36727c01176cc86a136c2ed8b2cc13bc27853c7c
parenta78a07a5111c36505a6d714dfa4a12a8db5f481e
Merge branch 'master' of git.evergreen-ils.org:Evergreen into SIP23738
Open-ILS/examples/oils_sip.xml.example