Merge pull request #2090 from alarcher/x11_S12_98_data
commit4e61fbdda8faa4c4a2d26e7c098c66e3bb870d95
authorAlexander Pyhalov <apyhalov@gmail.com>
Mon, 6 Jun 2016 14:43:28 +0000 (6 18:43 +0400)
committerAlexander Pyhalov <apyhalov@gmail.com>
Mon, 6 Jun 2016 14:43:28 +0000 (6 18:43 +0400)
tree5caf81262f99027f0253bd1d7df36b4235ea3dfa
parentc817ad26b9cb322f8f609c0b1a10af5bf513e513
parent6fab1a7c4eb68a0b1e47401bf61a06d0352cc4d5
Merge pull request #2090 from alarcher/x11_S12_98_data