Merge branch 'OR-from-anthraxx'
authorAlexander Popov <alex.popov@linux.com>
Tue, 24 Jul 2018 22:41:29 +0000 (01:41 +0300)
committerAlexander Popov <alex.popov@linux.com>
Tue, 24 Jul 2018 22:41:29 +0000 (01:41 +0300)
commit67945c656a645586b4f09a0a314ef3a4b78854f0
treecef8b4598835cfc86e77dfd60424bd6df2cd5821
parentf662d0ed1d75e698c4944d93b3f8226c545e5960
parent6d7703f40e1c3f7f6c9b664491602acd52d2b00d
Merge branch 'OR-from-anthraxx'