Merge branch 'master' of /var/cache/git/aymargeddon/current
-rw-r--r-- 9 .gitignore
-rw-r--r-- 773 CREDITS
-rw-r--r-- 4210 DONTDO
-rw-r--r-- 8950 TODO
-rw-r--r-- 63 agrep
drwxr-xr-x - doc
drwxr-xr-x - html
-rw-r--r-- 802 linecount
drwxr-xr-x - pic
-rw-r--r-- 132 push
drwxr-xr-x - src
drwxr-xr-x - var