[irclog2html/el6: 2/2] Merge branch 'master' into el6

[Fabian Affolter]

commit d04a715ff392df115196588bcec0c751d718984b
Merge: df31cd5 6427947
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Fri Jan 23 11:13:36 2015 +0100

    Merge branch 'master' into el6

 .gitignore       |    1 +
 irclog2html.spec |    7 +++++--
 sources          |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc irclog2html.spec
index a59180e,9387f66..1637932
--- a/irclog2html.spec
+++ b/irclog2html.spec
@@@ -38,10 -38,13 +38,13 @@@ install -Dpm 0644 src/%{name}/irclog.cs
  %{_bindir}/irclogsearch
  %{_bindir}/logs2html
  %{_datadir}/%{name}/
 -%{python2_sitelib}/%{name}/
 -%{python2_sitelib}/*.egg-info
 +%{python_sitelib}/%{name}/
 +%{python_sitelib}/*.egg-info
  
  %changelog
+ * Fri Jan 23 2015 Fabian Affolter <mail at fabian-affolter.ch> - 2.14.0-1
+ - Update to new upstream version 2.14.0
+ 
  * Mon Jun 09 2014 Fabian Affolter <mail at fabian-affolter.ch> - 2.13.1-1
  - Update to new upstream version 2.13.1