From: Alan Knowles <alan@roojs.com>
Date: Fri, 2 May 2014 09:23:12 +0000 (+0800)
Subject: Merge branch 'master' of http://git.roojs.com/gitlive
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=588580253d3a14135f9700c6f88e012a60a18653

Merge branch 'master' of git.roojs.com/gitlive
---

588580253d3a14135f9700c6f88e012a60a18653