Transfered information from http://wiki.mediagoblin.org/Storage into docs/source/devel/storage
For info check out ticket: issues.mediagoblin.org/ticket/660
Updating branch...
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into ticket-660
Create add_media_to_collection()

The ideas is by Alon Levy.

Not only media_collect, but also other places might want to
add media to a collection. So refactor this into a function
for easier usage.
mediagoblin/submit/lib.py: fix typo

Signed-off-by: Alon Levy <alon@pobox.com>
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into dogmagoblin
resize_image: Change calling style a bit.

- entry: not used, removed.
- proc_state: going to be used, added.
- size_limits: not used, removed.
Create set_thread_locale and use it.

Setting up a new template env should not directly touch the
translation tools, but go through a function in
translations.py.
Check for duplicate collection slugs and make them unique. Add unique constraint to collection.slug model
Fix-bug-667-Use-lazy_pass_to_ugettext-for-forms.
Switching non-forms back to using normal pass_to_ugettext
Adding ReallyLazyProxy, a proxy that does what we expect :)
No lazy_* needed here; Add ReallyLazyProxy.__repr__.

One should use lazy_* only if you have a good reason.

This one found by our unit tests!

For example add_message adds the message to the session,
the session needs to be serialized (with json) and well,
LazyProxy is not serializable.

To aid in debugging, gave our ReallyLazyProxy a __repr__.
Unit test for ReallyLazyProxy.

LazyProxy caches its value. So create a unit test for
lazy_pass_to_ugettext to make sure its returned proxy
actually gives a different translation when the locale
is switched.
Removed an unused import
Merge remote-tracking branch 'refs/remotes/rodney757/issue643' into mergetest
Don't turn on sqlite refcheck stuff during migrations
Switch "sqlite_refcheck" keyword arg to "migrations" which Elrond thinks is cleaner

Also, if migrations is true, *explicitly* say that foreign key checking is off
Merge remote-tracking branch 'refs/remotes/npigeon/ticket-660'
word-wrapping the public/queue storage explainations in storage.rst
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into dogmagoblin