Merge branch '2.7' of ../phpMyFAQ-2.7 into 2.8

Author: thorsten

CHANGEDFILES

@@ -760,4 +760,4 @@ CHANGED FILES FROM 2.8.0-alpha2 -> 2.8.0-alpha3
 ./pdf.php
 ./rewrite.script
 ./search.php
-./ucp.php
+./ucp.php

CHANGELOG

@@ -41,8 +41,15 @@ Version 2.8.0-beta2 - 2013-
 - updated Czech translation (Jaroslav Síka)
 - fixed some bugs (Thorsten, Florian)
 
-Version 2.7.9 - 2012-09-
+Version 2.7.10 - 2013-01-
+-
+
+Version 2.7.9 - 2012-11-02
+- updated Czech translation (Jaroslav Síka)
+- updated Dutch translation
 - updated French translation
+- improved English translation
+- fixed some bugs (Thorsten)
 
 Version 2.7.8 - 2012-08-22
 - added experimental rewrite rules for Zeus Webserver (Chris Crawshaw)

README.md

@@ -125,5 +125,4 @@ Licensed under the terms of the GNU Lesser General Public License
 Licensed under the terms of the MIT License
 
 
-
-Copyright (c) 2001-2013 Thorsten Rinne and the phpMyFAQ Team
+Copyright (c) 2001-2013 Thorsten Rinne and the phpMyFAQ Team

phpmyfaq.spec

@@ -166,6 +166,9 @@ installation script.
 * Wed Sep 28 2011 Thorsten Rinne <[email protected]> - 2.8.0.alpha-1
 - New upstream version 2.8.0-alpha
 
+* Wed Nov 7 2012 Thorsten Rinne <[email protected]> - 2.7.10-1
+- New upstream version 2.7.10
+
 * Wed Aug 22 2012 Thorsten Rinne <[email protected]> - 2.7.9-1
 - New upstream version 2.7.9