Merge commit 'd3a0404274e5105b9d6279901246af8f7009eb6d' into v0.6

PeterSurda · PeterSurda · commit 60c447f56bae · 2016-08-14T12:44:18.000+02:00
- "env python2.7.x" was causing problems
diff --git a/src/bitmessagecli.py b/src/bitmessagecli.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7.x
+#!/usr/bin/python2.7
 # Created by Adam Melton (.dok) referenceing https://bitmessage.org/wiki/API_Reference for API documentation
 # Distributed under the MIT/X11 software license. See http://www.opensource.org/licenses/mit-license.php.
 
diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/python2.7
 # Copyright (c) 2012-2016 Jonathan Warren
 # Copyright (c) 2012-2016 The Bitmessage developers
 # Distributed under the MIT/X11 software license. See the accompanying

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python2.7.x`
	`1`	`+#!/usr/bin/python2.7`
`2`	`2`	`# Created by Adam Melton (.dok) referenceing https://bitmessage.org/wiki/API_Reference for API documentation`
`3`	`3`	`# Distributed under the MIT/X11 software license. See http://www.opensource.org/licenses/mit-license.php.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python2.7`
	`1`	`+#!/usr/bin/python2.7`
`2`	`2`	`# Copyright (c) 2012-2016 Jonathan Warren`
`3`	`3`	`# Copyright (c) 2012-2016 The Bitmessage developers`
`4`	`4`	`# Distributed under the MIT/X11 software license. See the accompanying`