list of original tweets (w/out duplicates) wasn't being initialized prior to the try-except loop. meant the frontpage would crash if tweets could not be loaded.
"bin/django loaddata initial_db" would overwrite the default user (id=1). changed the id off the dummy user from the initial_db fixture to over 9000.
added support to set the class on the main content container. can prove useful if you need some flatpage-specific css.
moved (most) of the content from the press page into flatpages. the logos stay hardcoded cause they need template variables to render (and have to be uploaded via commit anyway)
added 'press' to list of nav menu items
moved (most, sans gittip widget) of the content from the support page into flatpages.
Merge pull request #56 from avian2/fix-no-twitter-key

Don't crash if TWITTER_CONSUMER_KEY not set.
Merge branch 'master' of https://github.com/kiberpipa/Intranet
Minor new members mail changes.
Minor docs update, on add_event view.
Merge pull request #58 from kiberpipa/add_event_docs

Minor docs update, on add_event view.
Merge pull request #57 from kiberpipa/mail-message-update

Minor new members mail changes.
I can't pronounce "osnutek" in Slovene
Wiki documentation URL changed.
fix ajax test for www app
no more vip feed
Merge pull request #59 from kiberpipa/fixingtestsalneki

Fix two tests
make announce tinymce widget bigger
one of the mock events pointed to a nonexsistent user
disabled the pipa.ltsp app, as it's not being used anymore