Update .travis.yml
Merge branch 'master' into travis
Apply @uobikiemukot's patch (various pixel-format support)
https://gist.github.com/uobikiemukot/7adab29310caf0be6f7a
Swap bytes if depth == 2
Keep compatibility
Merge pull request #8 from saitoha/fix-segfault-with-introducing-various-pixformat

Keep compatibility
@uobikiemukot's patch in the conversation of #8
Merge branch 'feature-support-various-pixformat' of github.com:saitoha/libsixel into feature-support-various-pixformat
Merge branch 'master' into feature-support-various-pixformat

Conflicts:
	converters/img2sixel.c
	include/sixel.h.in
	src/tosixel.c
Merge branch 'hotfix-preventing-double-free' into feature-support-various-pixformat
Merge branch 'master' into build
Introduce --enable-debug configure option
Add -Werror to CFLAGS when --enable-debug configure option is specified
Merge branch 'master' into clib
clib integration: add --with-libcurl option by default
Add libjpeg support with --with-jpeg configure option
Merge branch 'configure-debug-option' into release-1.3
Merge branch 'clib' into release-1.3
Merge branch 'master' into release-1.3
Merge branch 'feature-libjpeg-integration' into release-1.3

Conflicts:
	converters/Makefile.am
	converters/Makefile.in