bbPress:

* Merge dev trunk with deploy trunk.
* Maintains 2.4 Beta 1 status for now.



git-svn-id: https://plugins.svn.wordpress.org/bbpress/trunk@742648 b8457f37-d9ea-0310-8a92-e5e31aec5664
bbPress: Update bbpress.pot.



git-svn-id: https://plugins.svn.wordpress.org/bbpress/trunk@742650 b8457f37-d9ea-0310-8a92-e5e31aec5664