Merge branch 'setterargs'
authorjeresig <jeresig@gmail.com>
Thu, 7 Jan 2010 19:26:06 +0000 (14:26 -0500)
committerjeresig <jeresig@gmail.com>
Thu, 7 Jan 2010 19:26:06 +0000 (14:26 -0500)
commitd6d5ed4c683ceee4d3c64ce75e7349dde8205d50
treee377719ab472a02cd24a6db629e83fbd25744ad9
parenta9665bbe9bb50b060b3f8f2f5facf2e1d1115f37
parent0e5370b89c0dfe56bf2f02fdd34fd820ecd48254
Merge branch 'setterargs'