pull
Merge branch 'master' of git://github.com/wakaba/cinnamon

Conflicts:
	lib/Cinnamon/Task/Git.pm