Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <mcihar@suse.cz>2012-02-13 16:03:00 +0400
committerMichal Čihař <mcihar@suse.cz>2012-02-13 16:03:00 +0400
commit8ad44da025380df8ae85b37adf48b84a12ae4356 (patch)
tree58f486f7f3c92e14a5dd77f72db474bc431e3000
parent0352af889ee7f720662e0e17df613f35ad8b6368 (diff)
parentd47d2fb13c89c7fad2b7066dc05fc4a58db9ca75 (diff)
Merge remote-tracking branch 'origin/QA_3_5'
-rw-r--r--Documentation.html3
-rw-r--r--README5
2 files changed, 3 insertions, 5 deletions
diff --git a/Documentation.html b/Documentation.html
index 04fb6d7d0c..987ed17d30 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4738,8 +4738,7 @@ GNU General Public License for more details.
<p>
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.
</p>
<!-- CREDITS -->
diff --git a/README b/README
index f25d7c6cec..2c4ac2dfca 100644
--- a/README
+++ b/README
@@ -36,9 +36,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301 USA
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
Requirements
------------