Merge pull request #196 from wigyori/for-15.05-re
authorJiri Slachta <[email protected]>
Sun, 12 Nov 2017 11:01:33 +0000 (13:01 +0200)
committerGitHub <[email protected]>
Sun, 12 Nov 2017 11:01:33 +0000 (13:01 +0200)
CC: re/rem: fix build on CC and upgrade

Trivial merge