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

[Ed J <edj src gnome org>]

commit 77d982c3f20585028650591af5f07bf2fa0b7b6e
Merge: 22561ef 5619c97
Author: Ed J <edj src gnome org>
Date:   Fri May 2 20:10:57 2014 +0100

    Merge branch 'testing'
    
    Conflicts:
        tutorials/Basic_Perl/index.htrw

 tutorials/Basic_Perl/basic                 |   33 +
 tutorials/Basic_Perl/basic-logo            |   63 +
 tutorials/Basic_Perl/basic-logo-dialog.png |  Bin 7933 -> 17386 bytes
 tutorials/Basic_Perl/basic-logo.png        |  Bin 9375 -> 6880 bytes
 tutorials/Basic_Perl/circles               |   60 +
 tutorials/Basic_Perl/circles.png           |  Bin 10062 -> 12168 bytes
 tutorials/Basic_Perl/hello-world1          |   52 +
 tutorials/Basic_Perl/hello-world1.png      |  Bin 7830 -> 12702 bytes
 tutorials/Basic_Perl/horiz-cat             |   61 +
 tutorials/Basic_Perl/index.htrw            | 1890 ++++++++++++++++------------
 tutorials/Basic_Perl/interact              |    7 +
 tutorials/Basic_Perl/paint-select          |   55 +
 tutorials/Basic_Perl/paint-select.png      |  Bin 4587 -> 7542 bytes
 tutorials/Basic_Perl/perl-gimp-from-shell  |    2 +
 tutorials/Basic_Perl/pg-shell              |   17 +
 tutorials/Basic_Perl/tpix.gif              |  Bin 0 -> 825 bytes
 tutorials/Basic_Perl/uni                   |   49 +
 tutorials/Basic_Perl/uni-entry.png         |  Bin 7290 -> 9748 bytes
 tutorials/Basic_Perl/uni-menu.png          |  Bin 13380 -> 55891 bytes
 tutorials/Basic_Perl/uni-result.png        |  Bin 2991 -> 9001 bytes
 20 files changed, 1461 insertions(+), 828 deletions(-)
---