Merged the Simplified Chinese (zh_CN) translation submitted by elliott callaway ...
[citadel.git] / buildbot /
drwxr-xr-x   ..
-rw-r--r-- 12267 master.cfg