merge issues from v1.3.1 build

bear · bear · commit db5fcf0a98ad · 2014-02-17T22:01:02.000-05:00
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,13 @@
+2014-02-17
+  changed version to 1.3 and then to 1.3.1 because I forgot to include CHANGES
+  fix Issue 143 - GetStatusOembed() url parameter was being stomped on
+  fix debugHTTP in a brute force way but it works again
+  Add id_str to Status class
+  Added LookupFriendship() method for checking follow status
+    pull request from lucas
+  Fix bug of GetListMembers when specifying `owner_screen_name`
+    pull request from shichao-an
+
 2014-01-18
   backfilling varioius lists endpoints
   added a basic user stream call
diff --git a/twitter/api.py b/twitter/api.py
@@ -1,5 +1,24 @@
 #!/usr/bin/env python
 
+#
+# vim: sw=2 ts=2 sts=2
+#
+# Copyright 2007 The Python-Twitter Developers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+'''A library that provides a Python interface to the Twitter API'''
+
 import base64
 from calendar import timegm
 import time
