From 412c5804be4bdbffd132815eb199b83bded1d215 Mon Sep 17 00:00:00 2001
From: MikeCoder <mikecoder13@gmail.com>
Date: Thu, 12 Jun 2014 14:31:14 +0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'lctt/master'