1972b4ea7c6cecb424fe334ce4081ce99e24f156 394fe24a2e628232638675795cf0bf43d1e986a6 Tom Locke tom@tomlocke.com http://github.com/tablatom/hobo/commit/3c80549ccc1db8b66353a200a740e89b98c0e519 3c80549ccc1db8b66353a200a740e89b98c0e519 2009-06-10T02:00:38-07:00 2009-06-10T02:00:38-07:00 Merge branch 'master' into experiments Fixed conflicts: hobo/taglibs/rapid_forms.dryml 42e40ee08bef2a3748dccf2be00bce509f200c15 Tom Locke tom@tomlocke.com