Version 3f25422a-d98f-11e2-a555-00238b21b463
Merge branch 'master' into dreamhost
Added css and js to merge ignoring.
Trying glob syntax
Merge branch 'master' into dreamhost
deleted gitattributes.
modified gitignore.
Merge branch 'master' into dreamhost
Added gitattributes.
Merge master into branch dreamhost
Version ee6afcc8-da54-11e2-a1cf-00238b21b463
Merge master into branch dreamhost
Version 856948c2-da56-11e2-877b-00238b21b463
Merge master into branch dreamhost
Version 79776980-da57-11e2-b046-00238b21b463
Merge master into branch dreamhost
Version b6ecb7f2-da57-11e2-8316-00238b21b463
Merge master into branch dreamhost
Version 21dcb3e6-da58-11e2-9f58-00238b21b463
Merge master into branch dreamhost