# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1423647134 -3600
# Node ID f7966e9950e473ce3aed15b5d2478e591d5da1c2
# Parent  178de5edc0a8c63d528e78f002ce05f5a862a068# Parent  f796207e3df1eccbf7917d16e5b15b56f876e962
integration mainline->db-changes