3.6.1.


git-svn-id: https://develop.svn.wordpress.org/branches/3.6@25358 602fd350-edb4-49c9-b593-d223f7449a82