Merge remote-tracking branch 'upstream/master'

2011-04-21 13:53:32 -04:00 · 2011-04-21 13:53:32 -04:00 · e9e555e101
parent dfa7338f3d 4c40982a40
commit e9e555e101
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """
 phenny - An IRC Bot
 Copyright 2008, Sean B. Palmer, inamidst.com