Use origSettings.context unless it's undefined; for that case use merged settings...
authorDave Methvin <dave.methvin@gmail.com>
Fri, 24 Sep 2010 21:04:54 +0000 (17:04 -0400)
committerjeresig <jeresig@gmail.com>
Fri, 24 Sep 2010 21:04:54 +0000 (17:04 -0400)

No differences found