inappropriate operations on git lost it

git-svn-id: http://192.168.1.148/svn/storm_wireless/server/trunk/modules/nginx-http-spent-filter@20089 ec581458-a238-48d8-a50f-90b923c4f55a
Merge branch 'master' of https://github.com/duhoobo/nginx-http-spent-filter

Conflicts:
	t/sanity.t

git-svn-id: http://192.168.1.148/svn/storm_wireless/server/trunk/modules/nginx-http-spent-filter@20090 ec581458-a238-48d8-a50f-90b923c4f55a
I created a mess for committing to svn repo and github at the same time

git-svn-id: http://192.168.1.148/svn/storm_wireless/server/trunk/modules/nginx-http-spent-filter@20091 ec581458-a238-48d8-a50f-90b923c4f55a
Merge branch 'master' of https://github.com/duhoobo/nginx-http-spent-filter

Conflicts:
	t/sanity.t