Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	3861d4ddc2
						 | 
						
							
							
								
								
								Added flensburg1
							
							
							
							
							
							
						 | 
						
							2014-08-23 14:36:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	3202299063
						 | 
						
							
							
								
								
								Merge pull request #22 from ka-ba/master
							
							
							
							
							
							
							
							
							introducing Wiebaden, preparing Mainz to new joint net version (Gluon) 
							
						 | 
						
							2014-08-22 10:05:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ka-ba
								
							 
						 | 
						
							
							
								
							
							
	f4d55cd226
						 | 
						
							
							
								
								
								introducing Wiebaden, preparing Mainz to new joint net version (Gluon)
							
							
							
							
							
							
						 | 
						
							2014-08-22 01:16:32 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	b6fd43cd32
						 | 
						
							
							
								
								
								Merge pull request #21 from wusel42/master
							
							
							
							
							
							
							
							
							Please add Guetersloh's files 
							
						 | 
						
							2014-08-19 16:58:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Kai 'wusel' Siering
								
							 
						 | 
						
							
							
								
							
							
	5d7c2009ae
						 | 
						
							
							
								
								
								New key
							
							
							
							
							
							
						 | 
						
							2014-08-19 14:55:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									root
								
							 
						 | 
						
							
							
								
							
							
	2d45c2bc3b
						 | 
						
							
							
								
								
								Added Guetersloh
							
							
							
							
							
							
						 | 
						
							2014-08-19 14:39:34 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico von Geyso
								
							 
						 | 
						
							
							
								
							
							
	9b6891bdae
						 | 
						
							
							
								
								
								Move dreilaendereck1 to hosts dir
							
							
							
							
							
							
							
							
							@kalbfuss put their config file in the root directory
instead of the hosts dir. This should fix problems mentioned
in #19. 
							
						 | 
						
							2014-08-17 23:35:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	c0a2190cae
						 | 
						
							
							
								
								
								Merge pull request #20 from kalbfuss/patch-3
							
							
							
							
							
							
							
							
							Delete configuration file "weil-am-rhein1" 
							
						 | 
						
							2014-08-17 20:56:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	5c4c1db785
						 | 
						
							
							
								
								
								Merge pull request #19 from kalbfuss/patch-2
							
							
							
							
							
							
							
							
							New configuration file "dreilaendereck1" 
							
						 | 
						
							2014-08-17 20:56:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kalbfuss
								
							 
						 | 
						
							
							
								
							
							
	5b4c7c00fe
						 | 
						
							
							
								
								
								Delete configuration file "weil-am-rhein1"
							
							
							
							
							
							
							
							
							Configuration file "weil-am-rhein1" has become obsolete after merger of "Freifunk Weil am Rhein" into meta community "Freifunk Dreiländereck" 
							
						 | 
						
							2014-08-16 19:17:41 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kalbfuss
								
							 
						 | 
						
							
							
								
							
							
	116b1e5629
						 | 
						
							
							
								
								
								New configuration file "dreilaendereck1"
							
							
							
							
							
							
							
							
							Configuration file "dreilaendereck1" for first ICVPN-Gateway gw1.freifunk-3laendereck added. 
							
						 | 
						
							2014-08-16 19:15:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	66e0556fc9
						 | 
						
							
							
								
								
								Merge pull request #18 from FreifunkMD/master
							
							
							
							
							
							
							
							
							Add Magdeburg 
							
						 | 
						
							2014-08-06 22:45:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Andreas Pfohl
								
							 
						 | 
						
							
							
								
							
							
	fd8fa7e463
						 | 
						
							
							
								
								
								Added magdeburg1
							
							
							
							
							
							
						 | 
						
							2014-08-06 14:06:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Andreas Pfohl
								
							 
						 | 
						
							
							
								
							
							
	653ee2b674
						 | 
						
							
							
								
								
								Added magdeburg2
							
							
							
							
							
							
						 | 
						
							2014-08-06 13:25:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	947c2fcf93
						 | 
						
							
							
								
								
								Merge pull request #17 from sargon/upstream
							
							
							
							
							
							
							
							
							Current changes for kiel 
							
						 | 
						
							2014-07-29 19:41:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Ehlers
								
							 
						 | 
						
							
							
								
							
							
	ebd38dc69a
						 | 
						
							
							
								
								
								kiel: Rename kiel13 into kiel2
							
							
							
							
							
							
						 | 
						
							2014-07-27 11:27:50 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Ehlers
								
							 
						 | 
						
							
							
								
							
							
	0dc37c43d5
						 | 
						
							
							
								
								
								kiel: Add keys for new icvpn peer
							
							
							
							
							
							
						 | 
						
							2014-07-27 11:19:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	184c83a811
						 | 
						
							
							
								
								
								Merge pull request #16 from fuckup/master
							
							
							
							
							
							
							
							
							Pubkeys for rheinland0-2 added 
							
						 | 
						
							2014-07-22 19:27:09 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Oliver Herms
								
							 
						 | 
						
							
							
								
							
							
	8db7cd2336
						 | 
						
							
							
								
								
								Pubkeys for rheinland0-2 added
							
							
							
							
							
							
						 | 
						
							2014-07-21 21:58:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									FreifunkUFO
								
							 
						 | 
						
							
							
								
							
							
	1bd1f904f1
						 | 
						
							
							
								
								
								Merge pull request #15 from freifunkhamburg/gw03-remove
							
							
							
							
							
							
							
							
							Remove hamburg03 
							
						 | 
						
							2014-06-26 01:37:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Freifunk Ostholstein e.V
								
							 
						 | 
						
							
							
								
							
							
	22e7621aae
						 | 
						
							
							
								
								
								Added ostholstein1
							
							
							
							
							
							
						 | 
						
							2014-06-05 22:13:51 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ohrensessel
								
							 
						 | 
						
							
							
								
							
							
	8971f11a42
						 | 
						
							
							
								
								
								Remove hamburg03
							
							
							
							
							
							
							
							
							as it is not existent anymore and will not come back in the near future 
							
						 | 
						
							2014-06-05 22:06:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									root
								
							 
						 | 
						
							
							
								
							
							
	3239730751
						 | 
						
							
							
								
								
								weimar2: merged
							
							
							
							
							
							
						 | 
						
							2014-06-04 21:26:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									root
								
							 
						 | 
						
							
							
								
							
							
	8fa7d0fba2
						 | 
						
							
							
								
								
								weimar2: set port
							
							
							
							
							
							
						 | 
						
							2014-06-04 21:24:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	95fa9ca69d
						 | 
						
							
							
								
								
								Merge pull request #11 from FF-NRW/master
							
							
							
							
							
							
							
							
							wermelskirchen only-server is obsolete, will be recreated as nrw1 
							
						 | 
						
							2014-06-02 16:13:45 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	0126706f80
						 | 
						
							
							
								
								
								Merge pull request #14 from Freifunk-Rhein-Neckar/master
							
							
							
							
							
							
							
							
							add rheinneckar1 
							
						 | 
						
							2014-05-30 15:17:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ben Oswald
								
							 
						 | 
						
							
							
								
							
							
	92c30b9bb5
						 | 
						
							
							
								
								
								remove not allowed minus char from file name
							
							
							
							
							
							
						 | 
						
							2014-05-30 00:30:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ben Oswald
								
							 
						 | 
						
							
							
								
							
							
	dcf66630f7
						 | 
						
							
							
								
								
								add rhein-neckar1
							
							
							
							
							
							
						 | 
						
							2014-05-29 23:08:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Andi
								
							 
						 | 
						
							
							
								
							
							
	d84bf1c592
						 | 
						
							
							
								
								
								port updated for weimar2
							
							
							
							
							
							
						 | 
						
							2014-05-10 19:58:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	bb9693c355
						 | 
						
							
							
								
								
								Merge pull request #13 from ka-ba/master
							
							
							
							
							
							
							
							
							added mainz2 
							
						 | 
						
							2014-05-09 11:36:46 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ka-ba
								
							 
						 | 
						
							
							
								
							
							
	c57cffa9c9
						 | 
						
							
							
								
								
								added mainz2
							
							
							
							
							
							
						 | 
						
							2014-05-09 00:39:38 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									@RubenKelevra
								
							 
						 | 
						
							
							
								
							
							
	c84b14002a
						 | 
						
							
							
								
								
								wermelskirchen only-server is obsolete, will be recreated as nrw1
							
							
							
							
							
							
						 | 
						
							2014-04-19 18:07:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	ec98358822
						 | 
						
							
							
								
								
								Merge pull request #9 from freifunk-ffm/master
							
							
							
							
							
							
							
							
							changed frankfurt port and hostname 
							
						 | 
						
							2014-03-14 10:06:40 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christof Schulze
								
							 
						 | 
						
							
							
								
							
							
	c14d27e1f7
						 | 
						
							
							
								
								
								changed frankfurt port and hostname
							
							
							
							
							
							
						 | 
						
							2014-03-14 01:41:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	7752c2447c
						 | 
						
							
							
								
								
								Merge pull request #8 from kalbfuss/patch-1
							
							
							
							
							
							
							
							
							Create weil-am-rhein1 
							
						 | 
						
							2014-03-10 15:31:32 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kalbfuss
								
							 
						 | 
						
							
							
								
							
							
	d189779268
						 | 
						
							
							
								
								
								Create weil-am-rhein1
							
							
							
							
							
							
							
							
							Host-Eintrag für den ersten Tinc-Router der Freifunk-Community Weil am Rhein 
							
						 | 
						
							2014-03-09 17:06:03 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	cf081cb6b6
						 | 
						
							
							
								
								
								Merge pull request #7 from FreifunkBremen/master
							
							
							
							
							
							
							
							
							add bremen2 
							
						 | 
						
							2014-03-03 08:28:53 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jan-Philipp Litza
								
							 
						 | 
						
							
							
								
							
							
	949bd7b1c0
						 | 
						
							
							
								
								
								add bremen2
							
							
							
							
							
							
						 | 
						
							2014-03-01 14:54:50 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Paufler
								
							 
						 | 
						
							
							
								
							
							
	927c6889af
						 | 
						
							
							
								
								
								Merge pull request #6 from FF-NRW/patch-1
							
							
							
							
							
							
							
							
							add second nrw-server 
							
						 | 
						
							2013-12-30 02:15:27 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Freifunk NRW
								
							 
						 | 
						
							
							
								
							
							
	11535c2d55
						 | 
						
							
							
								
								
								add address for second nrw-server
							
							
							
							
							
							
						 | 
						
							2013-12-29 20:50:32 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Freifunk NRW
								
							 
						 | 
						
							
							
								
							
							
	bfe0672c60
						 | 
						
							
							
								
								
								add second nrw-server
							
							
							
							
							
							
						 | 
						
							2013-12-29 20:42:08 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Andi
								
							 
						 | 
						
							
							
								
							
							
	52647882c1
						 | 
						
							
							
								
								
								updated 2nd vpn server weimar
							
							
							
							
							
							
						 | 
						
							2013-12-03 12:28:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	bf70ef5e5d
						 | 
						
							
							
								
								
								update hostname of kiel1
							
							
							
							
							
							
						 | 
						
							2013-11-12 12:05:38 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Manuel Munz
								
							 
						 | 
						
							
							
								
							
							
	07f4658c97
						 | 
						
							
							
								
								
								Add pubkey for augsburg2
							
							
							
							
							
							
						 | 
						
							2013-11-09 19:46:49 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	9e8162ca19
						 | 
						
							
							
								
								
								rm kiel2, add kiel13
							
							
							
							
							
							
						 | 
						
							2013-11-07 21:37:06 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	6aeaf8e7a7
						 | 
						
							
							
								
								
								add .gitignore
							
							
							
							
							
							
							
							
							ignore common tinc files usually placed inside next to the files of this
repository 
							
						 | 
						
							2013-11-07 21:33:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									FreifunkUFO
								
							 
						 | 
						
							
							
								
							
							
	1ee5cfb627
						 | 
						
							
							
								
								
								Merge pull request #4 from bodems/master
							
							
							
							
							
							
							
							
							added bielefeld2 
							
						 | 
						
							2013-10-18 08:01:39 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									bodems
								
							 
						 | 
						
							
							
								
							
							
	69e5753e3d
						 | 
						
							
							
								
								
								added bielefeld2
							
							
							
							
							
							
						 | 
						
							2013-10-15 17:46:44 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	1599a076f5
						 | 
						
							
							
								
								
								scripts: add post-merge sample hook for debian
							
							
							
							
							
							
						 | 
						
							2013-10-09 10:49:19 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nils Schneider
								
							 
						 | 
						
							
							
								
							
							
	bddf304856
						 | 
						
							
							
								
								
								Merge pull request #3 from FreifunkJena/master
							
							
							
							
							
							
							
							
							added jena1 and jena2 
							
						 | 
						
							2013-10-09 01:16:15 -07:00 | 
						
						
							
							
							
							
								
							
							
						 |