merge from trunk
authorMike Rylander <mrylander@gmail.com>
Mon, 14 Mar 2011 17:57:23 +0000 (13:57 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 14 Mar 2011 17:57:23 +0000 (13:57 -0400)
commit4ba7f463fae3a8a80685dc97271e6e83afeced79
tree00bdf0cc89b4578766e0199e8bc6760984b9a6c6
parent0916cf2925049f7ce1817423010188e826b47714
parent0409488fc4a5c7969e60bb6daa44bba1e14b2274
merge from trunk
Open-ILS/examples/fm_IDL.xml
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul