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)
commitb0fae74b5b9ec1a49586dafa4588bba0798c8517
tree64a790723a3757ac4dee5ee045c187bb3d4d405b
parent4d29d70e54e1bea4f33e66a61c1cadf1a15fcb93
parentcbdf31cf2f6d4c350cc22132423641201f06a9ac
Merge branch 'master' into rc-tabs
lib/dashboard/dashboard-view.co
lib/template/dashboard.jade