stable-20121224
ccde03cb · Merge remote branch 'stable/master' into snapshot ·