From: Ian Weller <ian@ianweller.org>
Date: Tue, 22 Dec 2009 01:06:01 +0000 (-0600)
Subject: Merge branch 'master' of github.com:ianweller/mw
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/a58c94092d906cad0611dda3b0fc2b18501b0299?hp=dcc38e864010e822beb654f78c91c4c8aa48f48a

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

diff --git a/README b/README
index c77b07a..df2a37e 100644
--- 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 72554cc..b6d2dd1 100644
--- 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 135c2a1..bd12bb0 100644
--- 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 d5dd6dc..238f72e 100644
--- 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 b749dd8..c12663c 100644
--- 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 89654b8..22b9c5c 100644
--- 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