#1973 Handle redirected G2 URLs for tags, including g2_itemId passed
Merge branch 'g2_import'

Conflicts:
	modules/g2_import/controllers/g2.php
Rearrange tree on mikeage.net
Add developer from gallery3-contrib
Merge pull request #110 from mikeage/g2_import

 #1973 Handle redirected G2 URLs for tags, including g2_itemId passed
Automated update of .build_number to 307 for branch master
Last update: 861e8628f5d847cbf5bc3cc9f94254514e8296a8 (1 commits ago)
Improve the display context API to return a "siblings_callback" field
containing a callback that returns all the siblings.  Fixes #1975.
Automated update of .build_number to 308 for branch master
Last update: a983e8748e6e6667e968e96f8f0994f49b763b73 (1 commits ago)
Don't concatenate tainted strings in JS.  Fixes #1976.
Automated update of .build_number to 309 for branch master
Last update: 28cd0ad2c13fec256c4a0f162ec7b552eb88d66c (1 commits ago)
Merge remote-tracking branch 'upstream/master'
Remove greydragon
Add greydragon again