The branch, master has been updated
via 95e841ec2d1e289f3176d38a143fcb09a96d0cca (commit)
via e71bd6ae1a45cf9044145e11db10dea510e59f92 (commit)
via c722cf64a32c7a29ef3ad59ec005a5a2a63de51e (commit)
from 4a830cf6e01cc5c86f9de4251c017944d0f63a28 (commit)
- Log -----------------------------------------------------------------
commit 95e841ec2d1e289f3176d38a143fcb09a96d0cca
Merge: 4a830cf6e01cc5c86f9de4251c017944d0f63a28
e71bd6ae1a45cf9044145e11db10dea510e59f92
Author: Michal Čihař <[email protected]>
Date: Mon Feb 21 13:51:52 2011 +0100
Merge branch 'QA_3_3'
Conflicts:
lang/german-utf-8.inc.php
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bb5e30a..6ed9d74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -147,6 +147,7 @@
- bug #3153409 [core] 0 row(s) affected
- bug #3155842 [core] Edit relational page and page number
- [security] Minor security fixes, see PMASA-2010-9 and PMASA-2010-10
+- [lang] German update, thanks to to [email protected].
3.3.9.2 (2011-02-11)
- [security] SQL injection, see PMASA-2011-2
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
