c83f28d6489ef3f24017c4dee113db5f9c702407 2184928876b6a99cf2aeab6f1f20caafef7975da James Golick james@giraffesoft.ca http://github.com/giraffesoft/attribute_fu/commit/adb3a4719c7fdf511255739adff4e3d86a53526b adb3a4719c7fdf511255739adff4e3d86a53526b 2008-11-25T06:12:29-08:00 2008-11-25T06:12:29-08:00 Merge branch 'master' into jquery Conflicts: lib/attribute_fu/associated_form_helper.rb test/associated_form_helper_test.rb a88c518f8d15ec8715b3dddf1a56a25ad6f41d33 James Golick james@giraffesoft.ca