Merge branch '0.7.x' into 0.8.x

Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css

1 files changed, 1 insertions, 0 deletions

diff --git a/actions/api.php b/actions/api.php
index d2f0a2eff..8762b4bcd 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -130,6 +130,7 @@ class ApiAction extends Action
                                  'statuses/friends_timeline',
                                  'statuses/friends',
                                  'statuses/replies',
+                                 'statuses/mentions',
                                  'statuses/followers',
                                  'favorites/favorites');