Merge branch 'master' into joar-skip_transcoding
[mediagoblin.git] / mediagoblin / plugins / geolocation / templates /
drwxr-xr-x   ..
drwxr-xr-x - mediagoblin