Merge branch 'master' into rc-tabs
authordeclerambaul <fabian.kaelin@gmail.com>
Thu, 3 May 2012 06:22:45 +0000 (02:22 -0400)
committerdeclerambaul <fabian.kaelin@gmail.com>
Thu, 3 May 2012 06:22:45 +0000 (02:22 -0400)
commitee59a367b1fde5226a62b524749eb700da81260d
treef31697a36b3401b5cbe9ae6a6a41eca0e83c928f
parentad4b1c6cb0359f9af1f9b49b647ea7f809a5090a
parent2f3edc8535fe0d61885b1c584889c444700514e4
Merge branch 'master' into rc-tabs
lib/dashboard/dashboard-view.co
lib/template/dashboard.jade