Merge upstream branch 'development' into tonytrunk
authortonymke <tony.lechner@gmail.com>
Wed, 14 May 2014 02:12:50 +0000 (21:12 -0500)
committertonymke <tony.lechner@gmail.com>
Wed, 14 May 2014 02:12:50 +0000 (21:12 -0500)
commitf9f212b64bf336a2a489f3de2025f83ddcd5fca3
treeb5d4541902ffc249e0e3b4179ca3753fa16a5e4b
parent86f7df862a8b653550ae7271d2773be351c4b1ad
parent3a06d779b6f0b306db40b9811571eabd66a06688
Merge upstream branch 'development' into tonytrunk

Conflicts:
client/src/models/application.js
client/src/views/channel.js