[gimp-web: 5/6] Merge branch 'testing'

[Pat David <patdavid src gnome org>]

commit ec282d31c70667b75d6620ecae959f276cb64964
Merge: d5562cd 1bf7e6a
Author: Pat David <patdavid gmail com>
Date:   Wed Jan 13 13:52:26 2016 -0600

    Merge branch 'testing'

 pelicanconf.local.py               |    2 +-
 pelicanconf.testing.py             |    2 +-
 themes/newgimp/static/css/gimp.css |   27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
---