[aseprite] 58/64: Merge 'master' branch

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit b4588d34f4c37caed6fc4b2941c093c40325cb85
Merge: a4827a3 a9cc61e
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Jun 2 13:05:53 2016 -0300

    Merge 'master' branch

 src/doc/algorithm/shrink_bounds.cpp | 1 +
 1 file changed, 1 insertion(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git