# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1227419348 0
# Node ID 068a813b64543e117e073ec3b6797278be590024
# Parent  d07ae678819659a6e2051003763e3616bce25fd7# Parent  93b6587d9afbc82eea9dab23f8403e639bbe405b
Merge from waqas

diff -r 93b6587d9afb -r 068a813b6454 core/modulemanager.lua