Resolved trivial conflict: ordering of domains in regexp
Resolved trivial conflict: ordering of domains in regexp

technoweenie/restful-authentication,boonious/restful-authentication,Satish/restful-authentication,ept/saas-template,isotope11/BU_restful_authentication