Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

diff --git a/lib/framework.php b/lib/framework.php
index 350a1c268d047b7af61d0e499b1de6ca31313624..da96c8e1d4069fa5ff1ba64f452eabb0dd881ba1 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -33,6 +33,7 @@ define('AVATAR_MINI_SIZE', 24);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
+define('MESSAGES_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);