[mythweb/el7: 15/15] Merge remote-tracking branch 'origin/master' into el7
commit 2647c265b0969b99b372e1950ff9fd9e00f7ad17
Merge: 1728bdd 98b43d1
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Jan 27 00:35:54 2017 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 3 +-
ChangeLog | 146 +++++++++++++++++-----
mythweb-0.27-fixes.patch | 260 --------------------------------------
mythweb-0.28-fixes.patch | 318 +++++++++++++++++++++++++++++++++++++++++++++++
mythweb.spec | 138 +++++++++-----------
sources | 2 +-
6 files changed, 496 insertions(+), 371 deletions(-)
---