[auto] Merge from File
[auto] Merge from File

    • #73d42ee — Format `composer.json`. (Ivan Enderlin, 2014-01-03)

---

Merge branch 'master' of /var/lib/git/repositories/Library/File

Grummfy/Central,Grummfy/Central,Metalaka/Central,vcgato29/Central,vcgato29/Central,Metalaka/Central