From: Micheal <micheal@roojs.com>
Date: Mon, 26 Jan 2015 05:48:35 +0000 (+0800)
Subject: fix conflict
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=d63fce520c7421532474f03beff5c2982b841ed7

fix conflict
---

d63fce520c7421532474f03beff5c2982b841ed7