[gimp-web/testing: 2/2] Merge branch 'variants-fix' into testing

[Pat David <patdavid src gnome org>]

commit 627d01f1062cd24529ba959556e53ceb8d7ee17f
Merge: 83bc363 cb160b0
Author: Pat David <pat patdavid net>
Date:   Wed Nov 25 22:14:49 2015 -0600

    Merge branch 'variants-fix' into testing

 .../news/2012-07-20 GSoC2012 Midterm Evaluation.md |    2 +-
 content/news/2013-02-12 GSOC2013 Announced.md      |    1 +
 .../news/2013-04-08 GIMP Accepted to GSOC2013.md   |    1 +
 ...our Students to Work on GIMP During GSoC2013.md |    3 ++-
 content/news/2014-06-21.md                         |    8 --------
 5 files changed, 5 insertions(+), 10 deletions(-)
---