Merge branch 'maint'
authorJiang Xin <worldhello.net@gmail.com>
Mon, 14 May 2012 22:40:08 +0000 (06:40 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Mon, 14 May 2012 22:40:08 +0000 (06:40 +0800)
commitd81c7d1...84bed577c96aafc75700cf164152ad55
tree6f45364...73e534896c300fce541e8f1d64be1e5ecopy hash to clipboard (tree)
parent6a4a482...298866ec3386a46d9d8f933b80e3a359copy hash to clipboard (diff)
parentb741611...062db33dcd2ab41ec589cb659c465ebccopy hash to clipboard (diff)