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

[Alexandre Prokoudine <aprokoudine src gnome org>]

commit eee8690cbf64674d70b6847f1edeca9f01aee962
Merge: 2097237 6cb79d2
Author: Alexandre Prokoudine <alexandre prokoudine gmail com>
Date:   Sun Jan 15 18:27:56 2017 +0300

    Merge branch 'testing'

 content/.htaccess                                  |    4 +
 content/news/2017-01-15 2016 in Review.md          |   96 ++++++++++++++++++++
 ...unity-supported development of GEGL now live.md |   28 ++++++
 pelicanconf.local.py                               |    2 +-
 pelicanconf.testing.py                             |    2 +-
 5 files changed, 130 insertions(+), 2 deletions(-)
---