[aseprite] 98/308: Merge branch 'master'

[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 b0aea675cfb9fbdc68c64d13eb014da8c769670a
Merge: 3da1a80 13736a4
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Dec 11 19:44:48 2015 -0300

    Merge branch 'master'

 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

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