New commits:
commit d9e20034951f362ba0ab68d61a4bc6150249fe78
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gimp-help-2 optionally depends on gimp
commit 94f1bcdcc5ba7714faaffbbf7f24fbe14f3be558
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
gimp-help-2 may optionally use convert from imagemagick
commit 2acf6c792bc3deeaf640d1f7146faf1340114040
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
into devel"
This reverts commit 84519948ff8998d05b71bd2be153a5e3f05fde6d.
I don't know what this was trying to do, but it listed a bunch of
conflicts froma merge in devel...
commit ab7d0463a09a692758408d04a49b3f82e01a8047
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire into devel