Merge branch 'master' of gitorious.org:scottt/scottt-bin
authorScott Tsai <scottt.tw@gmail.com>
Mon, 18 Jun 2012 11:39:58 +0000 (19:39 +0800)
committerScott Tsai <scottt.tw@gmail.com>
Mon, 18 Jun 2012 11:39:58 +0000 (19:39 +0800)
commit47e8edd46e70ba51bf331f80d877d1a84a46a4de
tree417855f3aa23189e005072553f8091c678939dab
parent7371f7319c7ce0d87a5bc025c1e0453e29f9ef1f
parentfd4ad551e6b57c550c9d6d956b2cab8579e6da68
Merge branch 'master' of gitorious.org:scottt/scottt-bin