diff -r cc2da4a5ed9a -r 7de7630053cb tests/test-simplemerge.py
--- a/tests/test-simplemerge.py	Fri Jan 06 16:16:58 2012 +0100
+++ b/tests/test-simplemerge.py	Fri Jan 06 16:27:13 2012 +0100
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import unittest
 from unittest import TestCase