Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 26 Oct 2014 21:12:54 +0000 (22:12 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 26 Oct 2014 21:12:54 +0000 (22:12 +0100)
commita8eb749ef0ca44337d9eae9811304ac186bf3b27
treefc097b5b4fc726cff1258dfcabe4da6eb5a12c1a
parenta91e6f177cdc059e3a9a12d42b80dbfe2609ffb6
parent0320065eaa9099821e0add210c7891fa2a693c56
Merge branch '2.0'
files/lib/data/conversation/ConversationAction.class.php