From afca05fa0835f9d211632c9e0010de00427fc47a Mon Sep 17 00:00:00 2001
From: micio <micio@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 6 Jul 2013 13:38:15 +0000
Subject: [PATCH] Bazaar/Protect : resolved a conflict

git-svn-id: svn://ultimatepp.org/upp/trunk@6172 f0d560ea-af0d-0410-9eb7-867de7ffcac7