# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1337899089 -7200
# Node ID f79b2ad2be457cc324e5444fc9f7d1c67f363059
# Parent  15cd103f94463ee7f8dff8a1568ff28e4b70883b# Parent  c2106637d0f31ac0610188446663098f33f2397a
Merge branch 'stable'

diff -r 15cd103f9446 -r f79b2ad2be45 src/giflib.mk
diff -r 15cd103f9446 -r f79b2ad2be45 src/libshout-1-fixes.patch
diff -r 15cd103f9446 -r f79b2ad2be45 src/libssh2-1-fixes.patch