aboutsummaryrefslogtreecommitdiffstats
path: root/becommands/merge.py
diff options
context:
space:
mode:
Diffstat (limited to 'becommands/merge.py')
-rw-r--r--becommands/merge.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/becommands/merge.py b/becommands/merge.py
index f212b01..bc18479 100644
--- a/becommands/merge.py
+++ b/becommands/merge.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2008-2009 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2008-2009 Gianluca Montecchi <gian@grys.it>
+# W. Trevor King <wking@drexel.edu>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by