[commits] Horde branch master updated. 4714bc26d898ca366e2a49fcb9a6626124353851

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 7115a22bef9ead59732b473875f5cd38efee3b38

33d387b Fix parse error.
4714bc2 Merge branch 'master' of /horde/git/horde

-----------------------------------------------------------------------

commit 33d387b0915fbbd5df8807968913a19d668308aa
Author: Jan Schneider <jan at simon.horde.org>
Date:   Fri Aug 13 09:47:35 2010 +0000

    Fix parse error.

 whups/config/mime_drivers.php.dist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/whups/config/mime_drivers.php.dist?rt=horde-git&r1=1cecd5d8a0a787eeedf60a26ce38d960bb3e06cd&r2=33d387b0915fbbd5df8807968913a19d668308aa

-----------------------------------------------------------------------

commit 4714bc26d898ca366e2a49fcb9a6626124353851
Merge: 33d387b 7115a22
Author: Jan Schneider <jan at simon.horde.org>
Date:   Fri Aug 13 09:48:02 2010 +0000

    Merge branch 'master' of /horde/git/horde

 ansel/config/conf.xml                                     |   20 +++++++++++++
 ansel/lib/Ansel.php                                       |    3 +-
 ansel/lib/ImageGenerator/Mini.php                         |   11 +++++++
 ansel/lib/ImageGenerator/PolaroidThumb.php                |    7 ++++-
 ansel/lib/ImageGenerator/PrettyThumb.php                  |    9 +++++-
 ansel/lib/ImageGenerator/Screen.php                       |   11 +++++++
 ansel/lib/ImageGenerator/ShadowSharpThumb.php             |    9 ++++++
 ansel/lib/ImageGenerator/Thumb.php                        |   12 +++++++
 framework/Image/lib/Horde/Image/Effect/Im/Unsharpmask.php |    2 +-
 9 files changed, 80 insertions(+), 4 deletions(-)

http://git.horde.org/diff.php/ansel/config/conf.xml?rt=horde-git&r1=b4b9211d7fa7b59fafd3b150ed144695724a3d46&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/ansel/lib/Ansel.php?rt=horde-git&r1=8f763733ecf9cda3ed9172659632a8c1808c02c9&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/ansel/lib/ImageGenerator/Mini.php?rt=horde-git&r1=d293fe9fedf628bfe4bf1743f4d6d9c452011465&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/ansel/lib/ImageGenerator/PolaroidThumb.php?rt=horde-git&r1=c6f86a76f9ed9d8ec7f13c25c9ffff34ab5abce9&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/ansel/lib/ImageGenerator/PrettyThumb.php?rt=horde-git&r1=d293fe9fedf628bfe4bf1743f4d6d9c452011465&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/ansel/lib/ImageGenerator/Screen.php?rt=horde-git&r1=d293fe9fedf628bfe4bf1743f4d6d9c452011465&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/ansel/lib/ImageGenerator/ShadowSharpThumb.php?rt=horde-git&r1=d293fe9fedf628bfe4bf1743f4d6d9c452011465&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/ansel/lib/ImageGenerator/Thumb.php?rt=horde-git&r1=d293fe9fedf628bfe4bf1743f4d6d9c452011465&r2=4714bc26d898ca366e2a49fcb9a6626124353851
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Im/Unsharpmask.php?rt=horde-git&r1=d06c8b2415355f47a894a85fd62a7386fe806ef2&r2=4714bc26d898ca366e2a49fcb9a6626124353851