[aseprite] 100/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 a09df5201ecfb74857a4a5fe363cee86a0090e5c
Merge: be9b338 b0aea67
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Dec 11 19:48:18 2015 -0300

    Merge branch 'master'

 src/app/commands/cmd_undo_history.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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