Merge branch 'master' of github.com:diaspora/diaspora

Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass

Merge branch 'master' of github.com:diaspora/diaspora
1312728b · Raphael · aa0a00d9 · 92ccd3c2 · aa0a00d9 · aa0a00d9
--- a/public/images/glyphish-icons/icons/26-bandaid.png
+++ b/public/images/glyphish-icons/icons/26-bandaid.png
--- a/public/images/glyphish-icons/icons/27-planet.png
+++ b/public/images/glyphish-icons/icons/27-planet.png
--- a/public/images/glyphish-icons/icons/28-star.png
+++ b/public/images/glyphish-icons/icons/28-star.png
--- a/public/images/glyphish-icons/icons/29-heart.png
+++ b/public/images/glyphish-icons/icons/29-heart.png
--- a/public/images/glyphish-icons/icons/30-key.png
+++ b/public/images/glyphish-icons/icons/30-key.png
--- a/public/images/glyphish-icons/icons/31-ipod.png
+++ b/public/images/glyphish-icons/icons/31-ipod.png
--- a/public/images/glyphish-icons/icons/32-iphone.png
+++ b/public/images/glyphish-icons/icons/32-iphone.png
--- a/public/images/glyphish-icons/icons/33-cabinet.png
+++ b/public/images/glyphish-icons/icons/33-cabinet.png
--- a/public/images/glyphish-icons/icons/34-coffee.png
+++ b/public/images/glyphish-icons/icons/34-coffee.png
--- a/public/images/glyphish-icons/icons/35-shopping-bag.png
+++ b/public/images/glyphish-icons/icons/35-shopping-bag.png
--- a/public/images/glyphish-icons/icons/36-toolbox.png
+++ b/public/images/glyphish-icons/icons/36-toolbox.png
--- a/public/images/glyphish-icons/icons/37-suitcase.png
+++ b/public/images/glyphish-icons/icons/37-suitcase.png
--- a/public/images/glyphish-icons/icons/38-airplane.png
+++ b/public/images/glyphish-icons/icons/38-airplane.png
--- a/public/images/glyphish-icons/icons/39-spraycan.png
+++ b/public/images/glyphish-icons/icons/39-spraycan.png
--- a/public/images/glyphish-icons/icons/40-inbox.png
+++ b/public/images/glyphish-icons/icons/40-inbox.png
--- a/public/images/glyphish-icons/icons/41-picture-frame.png
+++ b/public/images/glyphish-icons/icons/41-picture-frame.png
--- a/public/images/glyphish-icons/icons/42-photos.png
+++ b/public/images/glyphish-icons/icons/42-photos.png
--- a/public/images/glyphish-icons/icons/43-film-roll.png
+++ b/public/images/glyphish-icons/icons/43-film-roll.png
--- a/public/images/glyphish-icons/icons/44-shoebox.png
+++ b/public/images/glyphish-icons/icons/44-shoebox.png
--- a/public/images/glyphish-icons/icons/45-movie1.png
+++ b/public/images/glyphish-icons/icons/45-movie1.png