Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 1 Feb 2013 18:15:07 +0000 (13:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 1 Feb 2013 18:15:07 +0000 (13:15 -0500)
commitf5d329cad2a40e84bfa4bf7ecc20ddbeb5213203
treead734c4bc071bf784f277ea3ede7c50b73939e4b
parentdb463084ebf375f5142dbcad9be2225edfe3c584
parent83620c60d631e488ed453b255228c324ea1104b4
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Open-ILS/xul/staff_client/server/index.xhtml