Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
authorFrancesco Pontillo <francescopontillo@gmail.com>
Tue, 26 Feb 2013 00:12:31 +0000 (01:12 +0100)
committerFrancesco Pontillo <francescopontillo@gmail.com>
Tue, 26 Feb 2013 00:12:31 +0000 (01:12 +0100)
commitbbd50186cdfbc18ac2a236f3d162d95f8c514301
tree0ff7d084147bb69a07251740f6137ba3dd495378
parent1de1fff0d9a7d8f89e0bd755f6e825e261b025df
parentfdd27e6a122c54edeaa0d2fa6ef454b358a857c5
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
component.json
component.json