Merge branch 'pr/374' into notificationsMerge2
authorAndrew Colden <andrewcolden@gmail.com>
Tue, 10 Sep 2013 18:23:48 +0000 (14:23 -0400)
committerAndrew Colden <andrewcolden@gmail.com>
Tue, 10 Sep 2013 18:23:48 +0000 (14:23 -0400)
commit3aecdb798a9b5e95383128ef3e26ed5e0621885e
treed282405d9aa76a27bef3895e36625d44301144f5
parent8644f2a9480509593b60ea60417636d40f289034
parentd70c63d455326e204f8c52c6f620c3ec37d178b9
Merge branch 'pr/374' into notificationsMerge2

Conflicts:
client/assets/src/views/panel.js
client/assets/src/index.html.tmpl
client/assets/src/translations/de-de.po
client/assets/src/translations/en-gb.po
client/assets/src/views/channel.js