[gimp-web/testing: 2/2] Merge branch 'CSP-migration' into testing

[Pat David <patdavid src gnome org>]

commit 9efa7fa56f7df94832cb3db42089c131be1fb373
Merge: 1e4cfa2 84b7243
Author: Pat David <patdavid gmail com>
Date:   Tue Oct 11 14:11:28 2016 -0500

    Merge branch 'CSP-migration' into testing

 content/about/ancient_history.md                   |    6 +++---
 content/about/mail_lists.md                        |    2 +-
 content/about/meta/git-workflow.md                 |    4 ++--
 content/about/meta/writing/index.md                |    4 ++--
 content/about/meta/wtf-pelican.md                  |   14 +++++++-------
 content/about/webmasters.md                        |    2 +-
 content/bugs/howtos/bugzilla.md                    |    2 +-
 content/develop/index.md                           |    2 +-
 content/docs/userfaq-old.md                        |    2 +-
 content/docs/userfaq.md                            |    2 +-
 content/downloads/install_help.md                  |    2 +-
 content/links/index.md                             |    4 ++--
 content/man/gimp.md                                |    2 +-
 content/news/2006-08-11 Open Usability.md          |    2 +-
 content/news/2011-03-18 GSoC2011 Participation.md  |    2 +-
 content/news/2011-04-15 GIMP 2.7.2.md              |    2 +-
 content/news/2011-08-22 GIMP 2.7.3.md              |    2 +-
 .../news/2011-10-21 Docs and DevPages Restored.md  |    2 +-
 content/news/2012-02-01 GIMP 2.6.12.md             |    2 +-
 content/news/2012-03-14 GIMP 2.7.5 Released.md     |    2 +-
 .../news/2012-03-21 GIMP accepted for GSoC2012.md  |    2 +-
 content/news/2012-05-03 GIMP 2.8 Released.md       |    2 +-
 ...-07-25 We Are Looking for Windows Developers.md |    2 +-
 .../2013-02-10 GIMP 2.8.4 for OSX Available.md     |    2 +-
 content/news/2013-02-12 GSOC2013 Announced.md      |    2 +-
 .../news/2013-11-28 GIMP Manual 2.8.1 Released.md  |    2 +-
 content/news/2014-05-13 Download Server Renamed.md |    2 +-
 .../news/2014-08-14 GIMP Manual 2.8.2 released.md  |    2 +-
 content/news/2014-08-26 GIMP 2.8.14 Released.md    |    2 +-
 ...dated 2.8.14 installer for microsoft windows.md |    2 +-
 content/news/2015-05-27 Sourceforge.md             |    2 +-
 content/news/2015-06-04 GEGL BABL.md               |    2 +-
 ...016-03-17 Corrupt Windows Installer Warnings.md |    4 ++--
 .../news/2016-06-05 Window Resize Crash Fixed.md   |    2 +-
 content/release-notes/gimp-2.2.md                  |    2 +-
 content/release-notes/gimp-2.3.3.md                |    2 +-
 content/release-notes/gimp-2.3.md                  |    2 +-
 content/release-notes/gimp-2.5.md                  |    2 +-
 content/release-notes/gimp-2.6.md                  |    2 +-
 content/release-notes/gimp-2.7.md                  |    2 +-
 content/release-notes/gimp-2.8.md                  |    2 +-
 content/source/index.md                            |    4 ++--
 content/tutorials/Basic_Color_Curves/index.md      |    2 +-
 .../Digital_Black_and_White_Conversion/index.md    |    4 ++--
 content/tutorials/Drawing_Shapes/index.md          |    2 +-
 content/unix/howtos/bugzilla.md                    |    2 +-
 46 files changed, 60 insertions(+), 60 deletions(-)
---