Merge branch 'gh-pages' of https://github.com/FortAwesome/Font-Awesome into gh-pages

assets/css/font-awesome.css

@@ -22,7 +22,7 @@
 
     */
 @font-face {
-  font-family: 'FontAwesome';
+  font-family: "FontAwesome";
   src: url('../font/fontawesome-webfont.eot');
   src: url('../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
   font-weight: normal;

assets/less/font-awesome.less

@@ -22,13 +22,15 @@
 
     */
 
+@fontAwesomePath: '../font';
+
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../font/fontawesome-webfont.eot');
-  src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
-    url('../font/fontawesome-webfont.woff') format('woff'),
-    url('../font/fontawesome-webfont.ttf') format('truetype'),
-    url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
+  src: url('@{fontAwesomePath}/fontawesome-webfont.eot');
+  src: url('@{fontAwesomePath}/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
+    url('@{fontAwesomePath}/fontawesome-webfont.woff') format('woff'),
+    url('@{fontAwesomePath}/fontawesome-webfont.ttf') format('truetype'),
+    url('@{fontAwesomePath}/fontawesome-webfont.svg#FontAwesome') format('svg');
   font-weight: normal;
   font-style: normal;
 }