In preparation for merge.
In preparation for merge.

See http://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#Merge-Strategies and http://stackoverflow.com/a/15233458

virtuoushub/fuzzy-octo-shame,Hornswaggler/fuzzy-octo-shame,FOShameDotOrg/fuzzy-octo-shame,virtuoushub/fuzzy-octo-shame,FOShameDotOrg/fuzzy-octo-shame