merge conflicts
authorMike Rylander <mrylander@gmail.com>
Wed, 2 Mar 2011 17:00:19 +0000 (12:00 -0500)
committerMike Rylander <mrylander@gmail.com>
Wed, 2 Mar 2011 17:00:19 +0000 (12:00 -0500)
commitec66c27e4d0b7ec9f2724ca80057e9df978a238f
treee81ae9c4c78d6ffea1cb114d7eb78e2a7798aa7f
parent0851dc40f7990c39a5d353e8287278af29302b1f
parente8f982929a47ef7a02bb10d0b54eeff9072f24ff
merge conflicts
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/asset.pm
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/dbi.pm
Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
Open-ILS/src/sql/Pg/040.schema.asset.sql