4 commits

Author	SHA1	Message	Date
Ashley Penney	994ac1a058	Rebuild the acceptance tests.	2014-08-07 15:52:19 -04:00
Jim Radford	16baff686c	mysql_deepmerge should treat underscore and dash equivalently, as mysql does	2014-01-23 22:41:58 -08:00
Marc Huffnagle	7ea41249e2	Fix raise_error deprecation warning	2013-10-31 12:42:42 -04:00
Justin Burnham	1b4a486bf9	Fixes issue #274 by using recursive hash merge.	2013-09-25 10:38:08 -07:00