Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
-rw-r--r-- 103 .gitignore
drwxr-xr-x - buildbot
drwxr-xr-x - citadel
drwxr-xr-x - contrib
drwxr-xr-x - ctdlphp
drwxr-xr-x - ctdlsalearn
drwxr-xr-x - ctdlsh
drwxr-xr-x - libcitadel
drwxr-xr-x - textclient
drwxr-xr-x - webcit-ng
drwxr-xr-x - webcit