Merging r780:786 from trunk to branches/0.3. Plus some work-in-progress.
[quassel.git] / templates /
drwxr-xr-x   ..
-rw-r--r-- 1464 cpp
-rw-r--r-- 1465 h