summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of git://1.0.49.10pragmo2010-11-041-1/+1
| |\ \
| | * | a1wiki mirror updated by sevilDavid Allen Chapman2010-11-041-1/+1
| | | |
| * | | Merge branch 'master' of git://git1.somerandomnick.anopragmo2010-10-291-32/+16
| |\| |
| * | | Merge branch 'master' of git://git1.somerandomnick.anopragmo2010-10-290-0/+0
| |\ \ \
| * \ \ \ Merge branch 'master' of git://git1.somerandomnick.anopragmo2010-10-290-0/+0
| |\ \ \ \
| * | | | | pragmo.ano NS updatedpragmo2010-10-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | dnsmasq_tld_conffile updated to automatically fetch the NS correct IP
| * | | | | Merge branch 'master' of git://1.0.49.10pragmo2010-10-284-0/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anopragmo2010-10-281-25/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anopragmo2010-10-281-0/+15
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-11-041-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | a1wiki mirror updated by sevilsevilNatas2010-11-041-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-291-32/+16
|\| | | | | | |
| * | | | | | | fixed formattingNick2010-10-291-8/+8
| | | | | | | |
| * | | | | | | switched IRCd list into a tableNick2010-10-291-32/+16
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-294-0/+9
|\| | | | | |
| * | | | | | Merge git://1.0.49.10Nick2010-10-294-0/+9
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | split up one item into two items to avoid confusion (sevil's irc web chat ↵root2010-10-284-0/+9
| | | |_|/ | | |/| | | | | | | | | | | | and irc like chat rooms), and added IcannNet accessible irc webchat (for those who need assistance in joining. -sevil
* | | | | Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-290-0/+0
|\| | | |
| * | | | Merge http://anogit.ucis.ano/Nick2010-10-291-0/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
* | | | Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-281-25/+13
|\| | |
| * | | redid the newline added to UFO's git during a reverted merge by sevilNatasNick2010-10-281-1/+1
| | | |
| * | | Revert "Merge branch 'master' of git://git1.somerandomnick.ano"Nick2010-10-282-16/+14
| | | | | | | | | | | | | | | | | | | | This reverts commit 0a745779ffd160ff77dbba359fc077ce8a83270a, reversing changes made to 3ab900bec3253e8ccfdcba56e752da39723ee6fc.
| * | | Revert "Merge branch 'master' of git://git1.somerandomnick.ano"Nick2010-10-281-10/+0
| | |/ | |/| | | | | | | | | | This reverts commit ba3a6ce7443f675177d6e2cbc7e777b99120da79, reversing changes made to 0a745779ffd160ff77dbba359fc077ce8a83270a.
* | | Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-281-0/+15
|\| | | |/ |/|
| * added ns2ip script (to make it easy to fix the dnsmasq autogen script)Nick2010-10-281-0/+15
| |
* | Added AS1112 for UCIS Anortr2Ivo Smits2010-10-271-0/+1
|/
* sevil's new domsroot2010-10-266-0/+6
|
* Merge branch 'master' of git://git1.somerandomnick.anoroot2010-10-261-0/+10
|\ | | | | | | | | Conflicts: doc/www.anonet2.org/public_pod/index.pod
| * Merge git://1.0.49.10Nick2010-10-261-2/+3
| |\ | | | | | | | | | | | | Conflicts: doc/www.anonet2.org/public_pod/index.pod
* | | Merge branch 'master' of git://git1.somerandomnick.anoroot2010-10-262-14/+16
|\| | | |/ |/| | | | | Conflicts: doc/www.anonet2.org/public_pod/index.pod
| * Updated some chat addresses and a small change in the layout of the public ↵Ivo Smits2010-10-262-22/+8
| | | | | | | | website
| * Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-261-0/+2
| |\
| * \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-251-1/+1
| |\ \
| * \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-252-35/+119
| |\ \ \
| * \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-244-0/+4
| |\ \ \ \
| | * \ \ \ Merge git://1.0.169.1/ano2Nick2010-10-241-0/+1
| | |\ \ \ \
| | * | | | | Assignments for haraldharald2010-10-243-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ip 1.0.169.0/24 as 169
| * | | | | | Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-212-14/+16
| |\| | | | |
| * | | | | | Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-201-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-191-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-181-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-175-0/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-151-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-156-0/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-151-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-153-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-152-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://git1.somerandomnick.anoIvo Smits2010-10-153-11/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | sevil's services updated. (3-10262010)root2010-10-261-6/+7
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | new links at a2.oNick2010-10-261-0/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |