[shutter] 46/73: Merge branch 'upstream'

[ChangZhuo Chen]

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

czchen pushed a commit to branch master
in repository shutter.

commit f3c677d75924139819c8010d7a12b3e5185fc688
Merge: 81aa0e5 19f59ba
Author: Ryan Niebur <ryan at debian.org>
Date:   Fri Jun 15 20:55:11 2012 -0700

    Merge branch 'upstream'


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/shutter.git