tree d22f3329f53d46c244162da0759f0e705632a7a6
parent 896240c09de4fe434f778f10aaf2811a81a52ea4
parent 90c23d25bdef78bd7f5639cedf9a4790e0437ebe
author David Pursehouse <david.pursehouse@sonymobile.com> 1427659123 +0100
committer David Pursehouse <david.pursehouse@sonymobile.com> 1427659185 +0100

Merge branch 'stable-2.11'

* stable-2.11:
  Fix replication_log with external log4j.configuration

Change-Id: I2313d7d7aa4ea6f45702ab773226afc13130a166