From: Alan Pippin Date: Thu, 28 Oct 2010 16:59:24 +0000 (-0600) Subject: Merge branch 'owenleonard/ht_sandbox' X-Git-Tag: release_1_1_0 X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20.%20%24this-%3Ephpgw_js_url%20.%20%27/jscalendar/%7Bview%7D?a=commitdiff_plain;h=refs%2Fremotes%2Fgithub%2Fmaster;p=eq%2F.git Merge branch 'owenleonard/ht_sandbox' --- 5ae6b075235ebca24477826e45076cf5542d18b9