gem
Merge remote branch 'upstream/master'
Merge branch 'master' of github.com:diasporg/diaspora
yea