Permission changes?
Merge branch 'master' of github.com:rfurman/arxaliv
.
RSS and styling and indicting of new links and making indextank index multi_sr_id properly
Merge branch 'master' of git://github.com/reddit/reddit

Conflicts:
	r2/r2/templates/searchform.html
Disable voting when one has yet to comment on a link, change ini for scripts to only start one database connection
Merge branch 'master' of git://github.com/reddit/reddit
Changed default home page, made trials public, mdae arxiv posts have 0 votes from the start and not 1
Merge branch 'master' of git://github.com/reddit/reddit
Added homepage
Merge branch 'master' of git://github.com/reddit/reddit
Added the Annals of Mathematics
Added new front page, reallowed upvoting, enabled /arxalivs/ url to work properly, disallowed /duplicates/ pages in robots.txt
Merge branch 'master' of git://github.com/reddit/reddit
Changes
:qq!Merge branch 'master' of git://github.com/reddit/reddit

Conflicts:
	r2/r2/lib/db/queries.py
	r2/r2/lib/pages/pages.py
Commit existing changes
Add homepage.html homepage2.html and the trackback library
Merge git://github.com/reddit/reddit

Conflicts:
	.gitignore
	r2/check_procs.sh
	r2/example.ini
	r2/r2/config/middleware.py
	r2/r2/config/routing.py
	r2/r2/controllers/api.py
	r2/r2/controllers/buttons.py
	r2/r2/controllers/error.py
	r2/r2/controllers/front.py
	r2/r2/controllers/listingcontroller.py
	r2/r2/i18n/en/LC_MESSAGES/r2.mo
	r2/r2/i18n/en/LC_MESSAGES/r2.po
	r2/r2/lib/count.py
	r2/r2/lib/db/queries.py
	r2/r2/lib/db/stats.py
	r2/r2/lib/db/tdb_sql.py
	r2/r2/lib/indextank.py
	r2/r2/lib/menus.py
	r2/r2/lib/pages/pages.py
	r2/r2/lib/promote.py
	r2/r2/lib/solrsearch.py
	r2/r2/lib/strings.py
	r2/r2/lib/template_helpers.py
	r2/r2/lib/utils/trial_utils.py
	r2/r2/models/link.py
	r2/r2/models/subreddit.py
	r2/r2/public/static/css/reddit.less
	r2/r2/public/static/reddit_spam.png
	r2/r2/templates/base.html
	r2/r2/templates/base.xml
	r2/r2/templates/bookmarklets.compact
	r2/r2/templates/link.html
	r2/r2/templates/newlink.html
	r2/r2/templates/prefoptions.html
	r2/r2/templates/reddit.html
	r2/r2/templates/redditheader.html
	r2/r2/templates/searchbar.html
	r2/r2/templates/searchform.html
	r2/r2/templates/subscriptionbox.html
	scripts/broken_things.sh
	scripts/gen_time_listings.sh
	scripts/indextank_backfill.py
	scripts/rising.sh
	scripts/send_mail.sh
	scripts/tracker.py
	scripts/update_promos.sh
	scripts/update_reddits.sh
	scripts/update_sr_names.sh
	srv/comments_q/run
	srv/commentstree_q/run
	srv/scraper_q/run
	srv/vote_comment_q/run
	srv/vote_link_q/run
Merge branch 'master' of github.com:rfurman/arxaliv