Merge branch 'master' of github.com:ianweller/mw

diff --git a/README b/README
index c77b07a3c18f48a1f8d0c407077fa593a5bc839f..df2a37e3ceb6715ea2e2f6dc7ddf1dc67216b44f 100644 (file)
--- a/README
+++ b/README
@@ -16,5 +16,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+with this program.  If not, see <http://www.gnu.org/licenses/>.

diff --git a/src/mw/__init__.py b/src/mw/__init__.py
index 72554cc4724e77ab3a6b7c98a81416d4de2a2e11..b6d2dd18b9765ab9183f13d5f1e66a3a7a608d63 100644 (file)
--- a/src/mw/__init__.py
+++ b/src/mw/__init__.py
@@ -13,6 +13,5 @@
 # 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###

diff --git a/src/mw/api.py b/src/mw/api.py
index 135c2a1e56deb4e529d9dbf7ec863c75fd09ff5e..bd12bb0ffd2f15f5011398d6f4d14b4f6594de81 100644 (file)
--- a/src/mw/api.py
+++ b/src/mw/api.py
@@ -13,8 +13,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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 import cookielib

diff --git a/src/mw/cli.py b/src/mw/cli.py
index d5dd6dc875d7699262868674e04019990b2bf9c2..238f72ed9b518264f17e2ea28bfed8719577dc6e 100644 (file)
--- a/src/mw/cli.py
+++ b/src/mw/cli.py
@@ -13,8 +13,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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 import inspect

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index b749dd841ecdafe13d4f71aa8f45470a9cd0363b..c12663c1e0fcca00d94ea902adf2a0e36fce348f 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -13,8 +13,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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 import getpass

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 89654b8b3a272b153b762c09755582c711fa6b32..22b9c5cf0049144092ecc6c0b2d1aee4e7365020 100644 (file)
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -13,8 +13,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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 import ConfigParser