The branch, master has been updated via e2068a73d59dc2c01a86215717e992918ef2cdaf (commit) via 0bc5b4a18b029c0900839bf529d3860b66dcffd1 (commit) from 33c24a3a2a4bf67844e2e1da81236f745f0b265c (commit)

- Log ----------------------------------------------------------------- commit e2068a73d59dc2c01a86215717e992918ef2cdaf Merge: 0bc5b4a 33c24a3 Author: Michal Čihař michal@cihar.com Date: Tue Sep 6 15:29:44 2011 +0200

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/scripts

commit 0bc5b4a18b029c0900839bf529d3860b66dcffd1 Author: Michal Čihař michal@cihar.com Date: Tue Sep 6 15:28:12 2011 +0200

Fix link

-----------------------------------------------------------------------

Summary of changes: website/pma-copy-docs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/website/pma-copy-docs b/website/pma-copy-docs index 2dd16bd..24b5cad 100755 --- a/website/pma-copy-docs +++ b/website/pma-copy-docs @@ -40,7 +40,7 @@ copy of phpMyAdmin. </p> <p> Alternatively you can try <a -href="http://demo.phpmyadmin.net/trunk-config/setup/%22%3Esetup script on our demo +href="http://demo.phpmyadmin.net/master-config/setup/%22%3Esetup script on our demo server</a>. </p> </body>

hooks/post-receive