From: Francesco Pontillo <francescopontillo@gmail.com>
Date: Mon, 18 Mar 2013 22:32:44 +0000 (+0100)
Subject: Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
X-Git-Tag: v2.3.2~4^2~3
X-Git-Url: http://git.roojs.org/?p=bootswatch;a=commitdiff_plain;h=266c8ea28da92dc14fe6cb4207c149f3153141a5

Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	shamrock/index.html
---

266c8ea28da92dc14fe6cb4207c149f3153141a5