old-git.evergreen-ils.org Git - evergreen/equinox.git/commit

author	Mike Rylander <mrylander@gmail.com>
	Tue, 19 Apr 2011 17:36:43 +0000 (13:36 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Tue, 19 Apr 2011 17:36:43 +0000 (13:36 -0400)
commit	465ce6514eac850c95a1061b5630ea0783e97cd5
tree	78338e198577a7803844de5028c05538593d0a0b	tree
parent	6a736db573291b276db7c6c4d7145aba7857d12e	commit \| diff
parent	28283b6fea32c44658a515816943b577281de3af	commit \| diff

Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into vandelay-improvement

Evergreen working repo (Equinox)

Open-ILS/examples/fm_IDL.xml	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/opac/locale/en-US/lang.dtd	diff1 \|	diff2 \|	blob \| history
Open-ILS/xul/staff_client/chrome/content/main/menu.js	diff1 \|	diff2 \|	blob \| history
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul	diff1 \|	diff2 \|	blob \| history