# HG changeset patch
# User Jamie Bullock <jamie@jamiebullock.com>
# Date 1415405222 0
# Node ID 5b13897691e8b6de07cbf132af94d9d502e5113c
# Parent  4a9a0c872494476ccc073d5a55b8a8670c92d78c# Parent  7063ad5214382394482cd79cb5f6f946df26d6d7
Merge branch 'feature/no-autotools' into develop