f
Merge branch 'master' of github.com:diasporg/diaspora
bleh
Merge branch 'master' of github.com:diasporg/diaspora

Conflicts:
	app/assets/images/404.png
	app/assets/images/add_contact_button.png
	app/assets/images/ajax-loader.gif
	app/assets/images/ajax-loader2.gif
	app/assets/images/ajax-loader_inverted.gif
	app/assets/images/arrow-left.png
	app/assets/images/arrow-right.png
	app/assets/images/arrow.psd
	app/assets/images/asterisk_white.png
	app/assets/images/branding/apple-splash.png
	app/assets/images/branding/asterisk.png
	app/assets/images/branding/ball.png
	app/assets/images/branding/ball_small.png
	app/assets/images/branding/header-logo.png
	app/assets/images/branding/header-logo2x.png
	app/assets/images/branding/logo_caps.png
	app/assets/images/branding/logo_large.png
	app/assets/images/branding/logo_small.png
	app/assets/images/branding/powered_by_diaspora.png
	app/assets/images/branding/seed.jpg
	app/assets/images/branding/white.png
	app/assets/images/branding/white@2x.png
	app/assets/images/branding/white_on_grey.png
	app/assets/images/close_label.png
	app/assets/images/connect_services.png
	app/assets/images/cubbies_collage.png
	app/assets/images/cubbies_screenshot2.png
	app/assets/images/deletelabel.png
	app/assets/images/diaspora_collage.png
	app/assets/images/diaspora_mobile_screens.png
	app/assets/images/down-tick-inset.png
	app/assets/images/facebox/closelabel.png
	app/assets/images/facebox/loading.gif
	app/assets/images/hatched-bg-dark.png
	app/assets/images/hatched-bg-small.jpg
	app/assets/images/hatched-bg.jpg
	app/assets/images/header-bg-long.jpg
	app/assets/images/header-bg.png
	app/assets/images/icons/arrow_down.png
	app/assets/images/icons/arrow_down_small.png
	app/assets/images/icons/arrow_up_small.png
	app/assets/images/icons/back_white.png
	app/assets/images/icons/bookmark.png
	app/assets/images/icons/camera.png
	app/assets/images/icons/check_yes_ok.png
	app/assets/images/icons/check_yes_ok_lighter.png
	app/assets/images/icons/check_yes_ok_white.png
	app/assets/images/icons/coffee.png
	app/assets/images/icons/cog.png
	app/assets/images/icons/comment_mobile_grey.png
	app/assets/images/icons/compose_mobile.png
	app/assets/images/icons/compose_mobile2.png
	app/assets/images/icons/cubbies.png
	app/assets/images/icons/globe.png
	app/assets/images/icons/heart.png
	app/assets/images/icons/heart_mobile_grey.png
	app/assets/images/icons/heart_mobile_red.png
	app/assets/images/icons/home_grey.png
	app/assets/images/icons/ignoreuser.png
	app/assets/images/icons/list_white.png
	app/assets/images/icons/mail_big.png
	app/assets/images/icons/mail_grey.png
	app/assets/images/icons/monotone_add_plus.png
	app/assets/images/icons/monotone_check_yes.png
	app/assets/images/icons/monotone_close_exit_delete.png
	app/assets/images/icons/monotone_email_letter_round.png
	app/assets/images/icons/monotone_pen_write.png
	app/assets/images/icons/monotone_plus_add_round.png
	app/assets/images/icons/monotone_question.png
	app/assets/images/icons/monotone_wrench_settings.png
	app/assets/images/icons/notifications_grey.png
	app/assets/images/icons/padlock-closed.png
	app/assets/images/icons/padlock-open.png
	app/assets/images/icons/pen_write.png
	app/assets/images/icons/pencil.png
	app/assets/images/icons/pencil_mobile_grey.png
	app/assets/images/icons/pencil_mobile_grey_active.png
	app/assets/images/icons/pencil_mobile_grey_mobile.png
	app/assets/images/icons/photo.png
	app/assets/images/icons/plus.png
	app/assets/images/icons/question.png
	app/assets/images/icons/reshare_mobile.png
	app/assets/images/icons/reshare_mobile_active.png
	app/assets/images/icons/search_white.png
	app/assets/images/icons/smiley_laughing.png
	app/assets/images/img/glyphicons-halflings-blue.png
	app/assets/images/img/glyphicons-halflings-green.png
	app/assets/images/img/glyphicons-halflings-red.png
	app/assets/images/mobile-spinner.gif
	app/assets/images/mobile.jpg
	app/assets/images/mocks/bp.jpeg
	app/assets/images/mocks/user_pic.jpeg
	app/assets/images/modern_browsers.png
	app/assets/images/pen_white.png
	app/assets/images/press_logos/mashable_logo.png
	app/assets/images/press_logos/nymag_logo.png
	app/assets/images/press_logos/techcrunch_logo.png
	app/assets/images/press_logos/the_new_york_times_logo.png
	app/assets/images/reply.png
	app/assets/images/services/facebook_sign_in.png
	app/assets/images/services/twitter_sign_in.png
	app/assets/images/social_media_logos/email-16x16.png
	app/assets/images/social_media_logos/email-24x24.png
	app/assets/images/social_media_logos/email-32x32.png
	app/assets/images/social_media_logos/email-48x48.png
	app/assets/images/social_media_logos/facebook-16x16.png
	app/assets/images/social_media_logos/facebook-24x24.png
	app/assets/images/social_media_logos/facebook-32x32.png
	app/assets/images/social_media_logos/facebook-48x48.png
	app/assets/images/social_media_logos/feed-16x16.png
	app/assets/images/social_media_logos/feed-24x24.png
	app/assets/images/social_media_logos/feed-32x32.png
	app/assets/images/social_media_logos/feed-48x48.png
	app/assets/images/social_media_logos/tumblr-16x16.png
	app/assets/images/social_media_logos/tumblr-24x24.png
	app/assets/images/social_media_logos/tumblr-32x32.png
	app/assets/images/social_media_logos/tumblr-48x48.png
	app/assets/images/social_media_logos/twitter-16x16.png
	app/assets/images/social_media_logos/twitter-24x24.png
	app/assets/images/social_media_logos/twitter-32x32.png
	app/assets/images/social_media_logos/twitter-48x48.png
	app/assets/images/social_media_logos/website-16x16.png
	app/assets/images/social_media_logos/website-24x24.png
	app/assets/images/social_media_logos/website-32x32.png
	app/assets/images/social_media_logos/website-48x48.png
	app/assets/images/static-loader.png
	app/assets/images/tipsy.gif
	app/assets/images/up-tick-inset.png
	app/assets/images/user/angela.jpg
	app/assets/images/user/default.png
	app/assets/images/user/uma.jpg
	app/assets/images/user/wolf.jpg
	app/assets/images/video-overlay.png
	app/assets/javascripts/app/app.js
	app/assets/javascripts/app/collections/likes.js
	app/assets/javascripts/app/collections/participations.js
	app/assets/javascripts/app/collections/photos.js
	app/assets/javascripts/app/collections/posts.js
	app/assets/javascripts/app/helpers/date_formatter.js
	app/assets/javascripts/app/helpers/handlebars-helpers.js
	app/assets/javascripts/app/helpers/handlebars-partials.js
	app/assets/javascripts/app/helpers/text_formatter.js
	app/assets/javascripts/app/models/block.js
	app/assets/javascripts/app/models/comment.js
	app/assets/javascripts/app/models/like.js
	app/assets/javascripts/app/models/participation.js
	app/assets/javascripts/app/models/photo.js
	app/assets/javascripts/app/models/photos.js
	app/assets/javascripts/app/models/post.js
	app/assets/javascripts/app/models/reshare.js
	app/assets/javascripts/app/models/stream.js
	app/assets/javascripts/app/models/user.js
	app/assets/javascripts/app/pages/post-viewer.js
	app/assets/javascripts/app/router.js
	app/assets/javascripts/app/views.js
	app/assets/javascripts/app/views/comment_stream_view.js
	app/assets/javascripts/app/views/comment_view.js
	app/assets/javascripts/app/views/content_view.js
	app/assets/javascripts/app/views/feedback_view.js
	app/assets/javascripts/app/views/header_view.js
	app/assets/javascripts/app/views/likes_info_view.js
	app/assets/javascripts/app/views/photo_view.js
	app/assets/javascripts/app/views/photos_view.js
	app/assets/javascripts/app/views/post-viewer/author.js
	app/assets/javascripts/app/views/post-viewer/feedback.js
	app/assets/javascripts/app/views/post-viewer/interactions.js
	app/assets/javascripts/app/views/post-viewer/nav.js
	app/assets/javascripts/app/views/post-viewer/new_comment.js
	app/assets/javascripts/app/views/post-viewer/reactions.js
	app/assets/javascripts/app/views/publisher_view.js
	app/assets/javascripts/app/views/stream_faces_view.js
	app/assets/javascripts/app/views/stream_object_view.js
	app/assets/javascripts/app/views/stream_post_views.js
	app/assets/javascripts/app/views/stream_view.js
	app/assets/javascripts/aspect-edit-pane.js
	app/assets/javascripts/aspect-sorting.js
	app/assets/javascripts/aspects-dropdown.js
	app/assets/javascripts/contact-edit.js
	app/assets/javascripts/contact-list.js
	app/assets/javascripts/diaspora.js
	app/assets/javascripts/friend-finder.js
	app/assets/javascripts/helpers/alert.js
	app/assets/javascripts/helpers/i18n.js
	app/assets/javascripts/ie.js
	app/assets/javascripts/inbox.js
	app/assets/javascripts/login.js
	app/assets/javascripts/mentions.js
	app/assets/javascripts/mobile.js
	app/assets/javascripts/pages/aspects-index.js
	app/assets/javascripts/pages/contacts-index.js
	app/assets/javascripts/pages/featured-users-index.js
	app/assets/javascripts/pages/invitations-edit.js
	app/assets/javascripts/pages/invitations-new.js
	app/assets/javascripts/pages/notifications-index.js
	app/assets/javascripts/pages/services-finder.js
	app/assets/javascripts/pages/users-getting-started.js
	app/assets/javascripts/photo-show.js
	app/assets/javascripts/publisher.js
	app/assets/javascripts/validation.js
	app/assets/javascripts/view.js
	app/assets/javascripts/widgets/aspect-navigation.js
	app/assets/javascripts/widgets/back-to-top.js
	app/assets/javascripts/widgets/direction-detector.js
	app/assets/javascripts/widgets/flash-messages.js
	app/assets/javascripts/widgets/header.js
	app/assets/javascripts/widgets/hovercard.js
	app/assets/javascripts/widgets/infinite-scroll.js
	app/assets/javascripts/widgets/lightbox.js
	app/assets/javascripts/widgets/notifications-badge.js
	app/assets/javascripts/widgets/notifications.js
	app/assets/javascripts/widgets/search.js
	app/assets/javascripts/widgets/stream.js
	app/assets/javascripts/widgets/timeago.js
	app/assets/stylesheets/.gitkeep
	app/assets/stylesheets/_mixins.css.scss
	app/assets/stylesheets/application.css.sass
	app/assets/stylesheets/autocomplete.css.sass
	app/assets/stylesheets/hovercard.css.scss
	app/assets/stylesheets/lightbox.css.scss
	app/assets/stylesheets/loader.css.scss
	app/assets/stylesheets/login.css.scss
	app/assets/stylesheets/media-box.css.scss
	app/assets/stylesheets/mentions.css.scss
	app/assets/stylesheets/mobile.css.scss
	app/assets/stylesheets/popup.css.scss
	app/assets/stylesheets/rtl.css.sass
	app/assets/stylesheets/sessions.css.sass
	app/assets/stylesheets/tags.css.sass
	app/assets/stylesheets/ui.css.sass
	app/assets/stylesheets/vendor/autoSuggest.css
	app/assets/stylesheets/vendor/blank.gif
	app/assets/stylesheets/vendor/blueprint/AUTHORS.textile
	app/assets/stylesheets/vendor/blueprint/LICENSE
	app/assets/stylesheets/vendor/blueprint/ie.css
	app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/cross.png
	app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/key.png
	app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/tick.png
	app/assets/stylesheets/vendor/blueprint/plugins/buttons/readme.txt
	app/assets/stylesheets/vendor/blueprint/plugins/buttons/screen.css
	app/assets/stylesheets/vendor/blueprint/plugins/fancy-type/readme.txt
	app/assets/stylesheets/vendor/blueprint/plugins/fancy-type/screen.css
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/doc.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/email.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/external.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/feed.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/im.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/pdf.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/visited.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/xls.png
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/readme.txt
	app/assets/stylesheets/vendor/blueprint/plugins/link-icons/screen.css
	app/assets/stylesheets/vendor/blueprint/plugins/rtl/readme.txt
	app/assets/stylesheets/vendor/blueprint/plugins/rtl/screen.css
	app/assets/stylesheets/vendor/blueprint/print.css
	app/assets/stylesheets/vendor/blueprint/screen.css
	app/assets/stylesheets/vendor/blueprint/src/forms.css
	app/assets/stylesheets/vendor/blueprint/src/grid.css
	app/assets/stylesheets/vendor/blueprint/src/grid.png
	app/assets/stylesheets/vendor/blueprint/src/ie.css
	app/assets/stylesheets/vendor/blueprint/src/print.css
	app/assets/stylesheets/vendor/blueprint/src/reset.css
	app/assets/stylesheets/vendor/blueprint/src/typography.css
	app/assets/stylesheets/vendor/bootstrap-responsive.css
	app/assets/stylesheets/vendor/bootstrap.css
	app/assets/stylesheets/vendor/facebox.css
	app/assets/stylesheets/vendor/fileuploader.css
	app/assets/stylesheets/vendor/html5-boilerplate-mobile.css
	app/assets/stylesheets/vendor/images/ajax-loader.png
	app/assets/stylesheets/vendor/images/icon-search-black.png
	app/assets/stylesheets/vendor/images/icons-18-black.png
	app/assets/stylesheets/vendor/images/icons-18-white.png
	app/assets/stylesheets/vendor/images/icons-36-black.png
	app/assets/stylesheets/vendor/images/icons-36-white.png
	app/assets/stylesheets/vendor/interim-bootstrap.css
	app/assets/stylesheets/vendor/jquery.mentionsInput.css
	app/assets/stylesheets/vendor/jquery.mobile-1.0b2.min.css
	app/assets/stylesheets/vendor/jquery.ui.autocomplete.css
	app/assets/stylesheets/vendor/tipsy.css
	app/assets/templates/activity-streams-photo.jst.hbs
	app/assets/templates/comment-stream.jst.hbs
	app/assets/templates/comment.jst.hbs
	app/assets/templates/feedback.jst.hbs
	app/assets/templates/header.jst.hbs
	app/assets/templates/likes-info.jst.hbs
	app/assets/templates/photo.jst.hbs
	app/assets/templates/post-viewer.jst.hbs
	app/assets/templates/post-viewer/author.jst.hbs
	app/assets/templates/post-viewer/comment.jst.hbs
	app/assets/templates/post-viewer/content/activity-streams-photo.jst.hbs
	app/assets/templates/post-viewer/content/multi-photo.jst.hbs
	app/assets/templates/post-viewer/content/note.jst.hbs
	app/assets/templates/post-viewer/content/photo-backdrop.jst.hbs
	app/assets/templates/post-viewer/content/rich-media.jst.hbs
	app/assets/templates/post-viewer/content/status.jst.hbs
	app/assets/templates/post-viewer/feedback.jst.hbs
	app/assets/templates/post-viewer/interactions.jst.hbs
	app/assets/templates/post-viewer/nav.jst.hbs
	app/assets/templates/post-viewer/new-comment.jst.hbs
	app/assets/templates/post-viewer/reactions.jst.hbs
	app/assets/templates/reshare.jst.hbs
	app/assets/templates/static-text.jst.hbs
	app/assets/templates/status-message.jst.hbs
	app/assets/templates/stream-element.jst.hbs
	app/assets/templates/stream-faces.jst.hbs
	vendor/assets/javascripts/bootstrap/bootstrap-modal.js
	vendor/assets/javascripts/bootstrap/bootstrap-popover.js
	vendor/assets/javascripts/bootstrap/bootstrap-transition.js
	vendor/assets/javascripts/bootstrap/bootstrap-twipsy.js
	vendor/assets/javascripts/facebox.js
	vendor/assets/javascripts/fileuploader-custom.js
	vendor/assets/javascripts/handlebars-1.0.0.beta.6.js
	vendor/assets/javascripts/jquery-ui-1.8.9.custom.min.js
	vendor/assets/javascripts/jquery.autoSuggest.custom.js
	vendor/assets/javascripts/jquery.autocomplete-custom.js
	vendor/assets/javascripts/jquery.autoresize.js
	vendor/assets/javascripts/jquery.charcount.js
	vendor/assets/javascripts/jquery.elastic.js
	vendor/assets/javascripts/jquery.events.input.js
	vendor/assets/javascripts/jquery.hotkeys.js
	vendor/assets/javascripts/jquery.idle-timer.js
	vendor/assets/javascripts/jquery.infinitescroll-custom.js
	vendor/assets/javascripts/jquery.mentionsInput.js
	vendor/assets/javascripts/jquery.placeholder.js
	vendor/assets/javascripts/jquery.textchange.min.js
	vendor/assets/javascripts/keycodes.js
	vendor/assets/javascripts/mailchimp/jquery.form.js
	vendor/assets/javascripts/mailchimp/jquery.validate.js
	vendor/assets/javascripts/mailchimp/jquery126.min.js
	vendor/assets/javascripts/markdown/Markdown.Converter.js
	vendor/assets/javascripts/markdown/Markdown.Sanitizer.js
	vendor/assets/javascripts/mbp-helper.js
	vendor/assets/javascripts/punycode.js
	vendor/assets/javascripts/rails.validations.js
	vendor/assets/javascripts/timeago.js
	vendor/assets/javascripts/underscore.js
hi
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
god
Merge branch 'master' of github.com:diasporg/diaspora

Conflicts:
	script/diaspora.god
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora