Merge commit '2545d27aacfe57c8f26fccfd45e382fbf5c111ac'
authorRoman Bazalevsky <rvb@rvb.name>
Tue, 19 May 2015 14:04:08 +0000 (17:04 +0300)
committerRoman Bazalevsky <rvb@rvb.name>
Tue, 19 May 2015 14:04:08 +0000 (17:04 +0300)
commit769d0bd71b19b467c195838379a379e0e2d69c2b
tree39c4ef6a9a0096e31df60cd9076a813653bae544
parent6f6f38ad845e089ef732873cfcf8e321d8cc1e38
parente7a2d1b901dbeb947e0ad605a53badc845e23ebc
Merge commit '2545d27aacfe57c8f26fccfd45e382fbf5c111ac'

Conflicts:
web/config_local.php