diaspora/diaspora — pull request #2722 by dmorley (2012-01-24 04:18:55+00:00)
Title: Update config/assets.yml

fix mergeyness