Merge remote branch 'upstream/master'
authorguibog <guibog@douban.com>
Sat, 21 Apr 2012 14:08:23 +0000 (22:08 +0800)
committerguibog <guibog@douban.com>
Sat, 21 Apr 2012 14:08:23 +0000 (22:08 +0800)
commit27d716aa4b83087a3e4459497ff28ecc80b30f47
treee2a147e1f9b3e9ef3e33eed1f846057dc87e4082
parentce3e50a9132bfb03ff9b53fc720ce48f0bb7747e
parent9a27906007485ad5b5e42b6fe844ac43b61446fa
Merge remote branch 'upstream/master'