2011-05-23 Joe Van Dyk * Added Changelog 2011-05-18 Joe Van Dyk * Merging empty strings should work if String#blank? is defined. * Use unix line endings * Removing extra whitespace 2010-01-11 Dan DeLeo * fix boolean merging according to mdkent's patch explicitly test for nils w/ #nil? instead of negating. Thanks mdkent! 2009-12-25 Dan DeLeo * miscellaneous cleanup * make rails/active_support compat optional * add jeweler rake task for gemability 2009-12-24 Dan DeLeo * VERSION: Version bump to 0.0.1 * VERSION: Version bump to 0.0.0 2009-11-06 Jonathan Weiss * import