[gimp-web: 11/11] Merge branch 'testing'

[Alexandre Prokoudine <aprokoudine src gnome org>]

commit 7f8cd4f24bbe606d7482d341e4a71176f71292fc
Merge: 1b62ce9 2695a85
Author: Alexandre Prokoudine <alexandre prokoudine gmail com>
Date:   Tue Mar 15 16:06:28 2016 +0300

    Merge branch 'testing'

 content/downloads/index.md                    |   49 +++-----------
 content/downloads/mirrors2.json               |   57 +++++++++++++++
 content/news/2016-03-14 GEGL 0.3.6.md         |   20 ++++++
 pelicanconf.local.py                          |    2 +-
 pelicanconf.testing.py                        |    2 +-
 plugins/gimp_mirrors/GeoIP.dat                |  Bin 0 -> 818578 bytes
 plugins/gimp_mirrors/GeoIP.dat.gz             |  Bin 0 -> 470095 bytes
 plugins/gimp_mirrors/GeoLite2-Country.mmdb    |  Bin 0 -> 2108182 bytes
 plugins/gimp_mirrors/GeoLite2-Country.mmdb.gz |  Bin 0 -> 1074451 bytes
 plugins/gimp_mirrors/__init__.py              |    1 +
 plugins/gimp_mirrors/gimp_mirrors.py          |   91 +++++++++++++++++++++++++
 11 files changed, 180 insertions(+), 42 deletions(-)
---