Merge pull request #265 from asolkar/master

Resolved conflict
This commit is contained in:
Remy Sharp 2013-03-23 03:12:03 -07:00
commit b2a3ee1ede

View file

@ -1 +1,5 @@
{"copyright":"Mahesh Asolkar","url":"http:\/\/mahesha.com"}
{
"copyright": "Mahesh Asolkar",
"url": "http://mahesha.com",
"theme": "double-windsor"
}