From: Geremia Taglialatela <tagliala.dev@gmail.com>
Date: Sat, 26 Oct 2013 20:20:51 +0000 (+0200)
Subject: Merge branch '4.0.1-wip' of github.com:FortAwesome/Font-Awesome into 4.0.1-wip
X-Git-Tag: v4.0.1~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F2263%2Fhead;p=thirdparty%2FFont-Awesome.git

Merge branch '4.0.1-wip' of github.com:FortAwesome/Font-Awesome into 4.0.1-wip

* '4.0.1-wip' of github.com:FortAwesome/Font-Awesome:
  Updated the icon count in the readme
  adding pointer to rtfm for syntax changes
  adding upgrade wiki page to documentation
---

c0a24d9b583901b2070f166722e51c8634733279