4d0a74baf23e100de57a9802bf020c50869bef6c 2813dbd9f6e7f18449ff8c9c753f439ca22e5e47 Alex Chaffee alex@stinky.com http://github.com/ctran/annotate_models/commit/69acce7c4a14850356fd90819d981111e471e0ad 69acce7c4a14850356fd90819d981111e471e0ad 2009-04-30T16:09:06-07:00 2009-04-30T16:09:06-07:00 Merge commit 'ctran/v2_0_2' * commit 'ctran/v2_0_2': upgrade to newgem 1.3 Conflicts: lib/tasks/annotate.rake lib/tasks/annotate_models.rake test/test_helper.rb 351c37e06d72fc91cbeabdd845893cf4737ce8ff Alex Chaffee alex@stinky.com