From b7682aa40c9d6ba7fd96e0930092f1e79032f29d Mon Sep 17 00:00:00 2001
From: hwchiu <sppsorrg@gmail.com>
Date: Sun, 2 Mar 2014 19:50:22 +0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'

-- 
GitLab