Merge remote-tracking branch 'upstream/2.4' into 2.4
authorpeng xiao <hisenxpress@gmail.com>
Thu, 14 Mar 2013 01:24:45 +0000 (09:24 +0800)
committerpeng xiao <hisenxpress@gmail.com>
Thu, 14 Mar 2013 01:24:45 +0000 (09:24 +0800)
commit34c716210404d8209eab3975592bd25499a6e4f1
treedde1cfa43236854eea985d3b37a03b504cd88ed7
parent3a565e001e71755fada5e52565fc2003fac53bb9
parent1d3219747aedcd68a801316b433af5df92fe4f52
Merge remote-tracking branch 'upstream/2.4' into 2.4