Merge branch 'patch-1' of git://github.com/jgoclawski/flower into jgoclawski-patch-1
Merge branch 'jgoclawski-patch-1'
Merge branch 'master' of github.com:mher/flower