#1987 g2_import module should redirect with a 301, not 302

As the g2_import process is generally assumed to be permanent, the
redirect should be a 301, and not a 302.
Merge pull request #117 from mikeage/fix_1987

 #1987 g2_import module should redirect with a 301, not 302
Automated update of .build_number to 323 for branch master
Last update: 070095cf6cc628374ff56489c27220ca61b5735a (1 commits ago)
Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
- Fix unit test for album url since empty albums now have thumbnails.
Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.
- Update xss_test golden file (change line numbers).
Merge pull request #120 from shadlaws/fix_1986_followon

Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.
Automated update of .build_number to 324 for branch master
Last update: a99b6f79aa8f66bc4d2ea34f814a2f53dde1d288 (1 commits ago)
Create gallery::allow_css_and_js_combining() which lets you disable combining CSS/JS
by touching var/DONT_COMBINE.  Fixes #1989.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 325 for branch master
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (3 commits ago)
Merge pull request #118 from shadlaws/fix_1982_followon

Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
Automated update of .build_number to 326 for branch master
Last update: 291059d86a5badb62360b88f5dccab4a07f47778 (1 commits ago)
Force a sort order no sibling checks.  Fixes #1990.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 327 for branch master
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (5 commits ago)
Follow-on to 949b8cda14ec037386da34c43248ebd60542f5da for #1982.
- Add extra condition to Item_Model_Test::urls_test to test cache busters of missing files.
- Previous commit fixes unit test for empty album url, but now no test checks missing files.
#1991 - Add options to graphics::mark_dirty to specify type and/or mime type.
- graphics::mark_dirty - added $type and $mime_type as options.
- graphics::mark_dirty - used options to set additional where conditions.
Merge pull request #122 from shadlaws/followon_1982_part_2

Follow-on to 949b8cda14ec037386da34c43248ebd60542f5da for #1982.
Automated update of .build_number to 328 for branch master
Last update: 1796a290c18a2e38c7714ac903c78ac54c373e6b (1 commits ago)
Merge pull request #124 from shadlaws/fix_1991

#1991 - Add options to graphics::mark_dirty to specify type and/or mime type