95fc6785e19dd3dfed01a3066fa78b55a03dbeaa 757310e6116f74721759d14e7f706e52e26b9f39 Ian White ian.w.white@gmail.com http://github.com/ianwhite/resources_controller/commit/1cf438fcf18dff7036186497bb7d1e47ec573e73 1cf438fcf18dff7036186497bb7d1e47ec573e73 2008-10-13T15:06:58-07:00 2008-10-13T15:06:58-07:00 Merge branch 'master' of git://github.com/econsultancy/resources_controller 2bb2742471614da87c90b1a148aacf1ba2ad8513 Ian White ian.w.white@gmail.com