Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 28 Aug 2015 16:40:33 +0000 (18:40 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 28 Aug 2015 16:40:33 +0000 (18:40 +0200)
commit0e7bcab8318605c8850f137d9d6f08d1dbf42c6f
tree568a412408fa111f329dc6f9de3674695e0b15e0
parent0eec4f8b9e561a8e25e2fe61449e178613ebe830
parent27394d89ccc9f69ed29a0b61098c3f57581643d4
Merge branch 'master' into next
files/lib/data/conversation/message/ViewableConversationMessage.class.php