[aseprite] 95/128: 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 aededaaeab52730286ba312ae8b38e09960da538
Merge: 382aad6 7d24d7c
Author: David Capello <davidcapello at gmail.com>
Date:   Tue May 3 12:43:51 2016 -0300

    Merge branch 'master'

 src/doc/file/gpl_file.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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