From: Nirbhay Choubey
Date: July 13 2012 2:30pm
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:4055 to 4056)
List-Archive: http://lists.mysql.com/commits/144449
Message-Id: <20120713143049.30456.67628.4056@Nirbhay-lenovo>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4056 Nirbhay Choubey	2012-07-13 [merge]
      Null merge.

 4055 Nirbhay Choubey	2012-07-13 [merge]
      Local merge from mysql-5.6.

    modified:
      client/mysql_config_editor.cc
      mysql-test/r/mysql_config_editor.result
      mysql-test/t/mysql_config_editor.test
No bundle (reason: useless for push emails).