Automatically built.

commit 2c533f21ec16f428da753a85e96e66fd8380bb83
Merge: 60080dd 1832515
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Dec 10 20:11:17 2014 -0800

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

commit 60080dd899923feac0167809f50d4698080bc559
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Dec 10 20:11:09 2014 -0800

    code.org translations 12/10
Merge branch 'test' into staging
hoc description chinese T
Merge pull request #833 from code-dot-org/test

DTP