# HG changeset patch
# User casties
# Date 1449688120 18000
# Node ID b530266402a336fd5f5a69cd661346746ecd9fc0
# Parent  8d598e37d008510785d3a4719a3b1b86d4e7eaa4# Parent  bba950221e716657dee64b54ff07fc2fbf172590
Merge from remove_escidoc branch
bba950221e716657dee64b54ff07fc2fbf172590