diff options
| author | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
|---|---|---|
| committer | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
| commit | 24848a8dccf0b8acc77b2e9fd007f613bbf1736b (patch) | |
| tree | 343ca29c494e3310c1d6fa4b4f2e97a396e21c8e /addons/document_webdav | |
| parent | 1b08798b52df8f0a3a72d116577cd7451b45b30c (diff) | |
| parent | 814a121dabbbe45a1c9ee671222b3a2bf261059a (diff) | |
[MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/document_webdav/test_davclient.py | 3 | ||||
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index ec112ec7c38..befb87829ed 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -24,7 +24,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py index 058dc1c748d..f3a8b35b582 100644 --- a/addons/document_webdav/test_davclient.py +++ b/addons/document_webdav/test_davclient.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- encoding: utf-8 -*- # # Copyright P. Christeas <p_christ@hol.gr> 2008,2009 @@ -24,7 +23,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################### """ A trivial HTTP/WebDAV client, used for testing the server diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index f67de272e29..e495f5c9f2f 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -30,7 +30,7 @@ # # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################### |