# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1273145140 -18000
# Node ID 6b2e4b5817170a7cb01480084991a813af3fdb1c
# Parent  31cda82337dcdcf67ce5b932f9a63f9bd132b09b# Parent  d7c80d23ed2103607bcb5179b2daf3d153593421
Merge 0.6->0.7

diff -r 31cda82337dc -r 6b2e4b581717 core/loggingmanager.lua