Merge branch 'kriansa-patch1' into dev

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 9c88ab04640f3ccc45e9a89ab16ba79e4862c524,09170c4624158307a4b41288e1fce003928781fe..1d4627ceb135248a9e155eb3d52f8fdb795d6e8f
--- 1/bootstrap.css
--- 2/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Mon Oct 31 23:21:58 PDT 2011
 - * Date: Mon Oct 31 23:26:38 PDT 2011
++ * Date: Mon Oct 31 23:27:57 PDT 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).

diff --cc bootstrap.min.css
Simple merge

diff --cc lib/patterns.less
Simple merge