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

[Pat David <patdavid src gnome org>]

commit b7586ad180d9fd4530eb4a242b6c05e2bf59f81b
Merge: 6cdc9e4 8ab6c64
Author: Pat David <patdavid gmail com>
Date:   Sun Jul 3 22:58:53 2016 -0500

    Merge branch 'testing'

 .../news/2016-06-02 GIMP 2.9.4 Released/index.md   |   86 +++++++++++---------
 content/news/2016-07-02 Texas Linux Fest.md        |   31 +++++++
 content/news/images/2016-TXLF/TXLF-header-fs8.png  |  Bin 0 -> 60250 bytes
 pelicanconf.local.py                               |    6 ++
 pelicanconf.py                                     |    5 +
 pelicanconf.testing.py                             |    5 +
 6 files changed, 94 insertions(+), 39 deletions(-)
---