Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
authorMike Rylander <mrylander@gmail.com>
Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)
commit5fc0098ccf457cb534bef4bc906a0226018a833d
treefc9769bfccbe96c447983b1cafde6920d9639dba
parent66e94d0b753b2c93f65c6ea25fcd23e80ab7a35d
parent8d9101979ef3011a07a43411b59c0e4b1a67efbd
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into vandelay-improvement
Open-ILS/examples/fm_IDL.xml
Open-ILS/xul/staff_client/chrome/content/main/menu.js