stable-20111212
e5de349f · Merge remote-tracking branch 'stable/master' ·