Merge branch 'master' into 1.1

[meshlink] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index dfa1123100142dad2b2416e7afc55a5b26383577..be70c24c32c8ce4d4adeb1dbcde8e8c652e4ad6a 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -13,11 +13,9 @@
     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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    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.
 */
 
 #ifndef __TINC_CONF_H__