Merge remote-tracking branch 'github/new-features'
commit8168e580f33837778ca91da807effcfd0ca596fa
authorFrank Li <lznuaa@gmail.com>
Mon, 9 May 2011 09:39:41 +0000 (9 17:39 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 9 May 2011 09:39:41 +0000 (9 17:39 +0800)
tree7734292e5fb97c5fc7cdae35c167321d425fa5f3
parent8b90d979d987d436065644c84df1087aa4bb1b73
parent689d1846e27db403f789f5d97aab9af8059e1fdc
Merge remote-tracking branch 'github/new-features'