Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: phpmyadmin/phpmyadmin
...
head fork: phpmyadmin/phpmyadmin
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on May 31, 2009
@helmo helmo bug #2799009 Login with ipv6 IP address breaks redirect 06bb14f
Commits on Jun 02, 2009
@lem9 lem9 bug #2796066 [priv] Inconsistent display of databases list ea466f9
Commits on Jun 08, 2009
@lem9 lem9 bug #2802870 [display] Incorrect overhead value for InnoDB eb587a5
@lem9 lem9 Hungarian update 27867b2
@lem9 lem9 Hungarian update 5af2139
Commits on Jun 15, 2009
@lem9 lem9 3.2.0 release dbb6bd9
@lem9 lem9 3.2.0 release 5f2c988
Commits on Jun 16, 2009
@lem9 lem9 bug #2806875 reporting a typo in the ChangeLog ac5c91c
@lem9 lem9 bug #2806875 reporting a typo in the ChangeLog 8247101
Commits on Jun 18, 2009
@lem9 lem9 Incorrect display in replication status b45effb
Commits on Jun 20, 2009
@lem9 lem9 undefined import_handle when importing zip file eb5a449
@lem9 lem9 bug #1601625 [display] The Ignore checkbox is not unchecked for ENUM a7f7413
Commits on Jun 21, 2009
@helmo helmo bug #2809930 [setup] Notice: Undefined variable: k in setup/index.php 9c11d55
Commits on Jun 24, 2009
@lem9 lem9 Incorrect report of missing relational features 8e4f011
Commits on Jun 27, 2009
@lem9 lem9 incorrect calling of an error message 9aa78b9
@lem9 lem9 undefined variable 5b7dd4f
Commits on Jun 30, 2009
@lem9 lem9 [security] XSS: Insufficient output sanitizing in bookmarks 81d42bb
@lem9 lem9 [security] XSS: Insufficient output sanitizing in bookmarks 76e2d15
@lem9 lem9 3.2.0.1 release bf0bfd2
@helmo helmo [security] XSS: Insufficient output sanitizing (not exploitable witho…
…ut a valid token)
824849c
Commits on Jul 01, 2009
@helmo helmo Depricating my users.sourceforge.net address 27d893d
Commits on Jul 02, 2009
@lem9 lem9 typo 4313dd1
Commits on Jul 04, 2009
@lem9 lem9 bug #2634827 [import] Using DELIMITER produces infinite cycle 34c7f50
Commits on Jul 05, 2009
@lem9 lem9 new language: uzbek (cyrillic and latin) 46e6d2d
Commits on Jul 06, 2009
@lem9 lem9 bug #2814109 [search] Right frame is blank 2a043e0
@lem9 lem9 bug #2816840 [priv] Cannot change details for a user 38c8c8f
Commits on Jul 07, 2009
@lem9 lem9 Uzbek update a3352eb
Commits on Jul 09, 2009
@lem9 lem9 updated status of translations having less than 50% done 60bd599
Commits on Jul 10, 2009
@lem9 lem9 bug #2816165 [display] Executed query not always displayed 0ccda98
@lem9 lem9 this require_once() was never executed 4e204a2
Commits on Jul 11, 2009
@lem9 lem9 bug #2819944 [setup] Incorrect mention of designer_coords 37c2116
Commits on Jul 13, 2009
@lem9 lem9 these are not default values but suggested values 232c8fe
@lem9 lem9 French update f4fda40
@helmo helmo Dutch update 9f793aa
Commits on Jul 15, 2009
@lem9 lem9 new Arabic translator 22f4466
@lem9 lem9 bug #2821757 [insert] "Insert another new row" no longer worked 9a45818
@lem9 lem9 another volunteer needed... 2dc08bf
@lem9 lem9 Norwegian update 3d519b8
Commits on Aug 29, 2009
@lem9 lem9 bug [export] Exporting results of a query which contains a LIMIT clau…
…se inside a subquery
b4f776e
Commits on Aug 30, 2009
@lem9 lem9 bug #2837722 [export] Run complex SQL then export does not work ad75912
@lem9 lem9 bug #2839548 [export] Triggers order on export 19331b9
@lem9 lem9 bug #2826986 [display] Order by BLOB and range display cd55ba7
Commits on Sep 03, 2009
@lem9 lem9 bug [display] After clicking on Show Function or Function, the UPDATE…
… query is not shown after execution
bdfa1c8
Commits on Sep 04, 2009
@lem9 lem9 bug [structure] Missing validation for BINARY and VARBINARY 54b463a
Commits on Sep 05, 2009
@lem9 lem9 we still need the MD5 sums 8c4135e
@lem9 lem9 3.2.3-dev cae1788
@lem9 lem9 3.2.2-rc1 8c57722
Commits on Sep 12, 2009
@lem9 lem9 German typo (#2833427), thanks to Daniel Marschall 32e388b
@lem9 lem9 German typo (#2833427), thanks to Daniel Marschall 5a90d70
@lem9 lem9 complete correction for German typo (#2833427), thanks to Daniel Mars…
…chall
0ba22cf
@lem9 lem9 complete correction for German typo (#2833427), thanks to Daniel Mars…
…chall
c8b6f54
Commits on Sep 13, 2009
@lem9 lem9 3.2.2 0b6e8b1
@lem9 lem9 3.2.2 7c4dfc3
@lem9 lem9 add reference to the new File Manager cce3322
Commits on Sep 14, 2009
@derek-schaefer derek-schaefer Improved ODS date/time/datetime export format. Patch #2856664 e0dfe5a
@lem9 lem9 This fix targets 3.2.3 and not the already-released 3.2.1; also, plea…
…se do not put 3.3 ChangeLog lines in the QA_3_2 branch
e0b97c3
Commits on Sep 17, 2009
@lem9 lem9 patch #2859788 [parser] Double-character delimiters (bug #2846239) 7cb7e8b
@lem9 lem9 parser should return an array in case of errors, thanks to Thomas Pul…
…ickal
8fda3c2
Commits on Sep 20, 2009
@lem9 lem9 group related directives 81a9708
@lem9 lem9 missing doc 4c91f6e
@lem9 lem9 bug #2832600 [export] Slow export when having lots of databases f990678
Commits on Sep 26, 2009
@lem9 lem9 bug #2537766 [import] Comments are stripped when editing store proced…
…ures
763cd2f
Commits on Sep 27, 2009
@lem9 lem9 bug #2852370 [operations] Renaming database deletes triggers f13698c
Commits on Sep 29, 2009
@lem9 lem9 no longer to do 293a7ef
Commits on Oct 03, 2009
@helmo helmo bug #2872247 [interface] Failed opening required mysql_charsets.lib.p…
…hp, thanks to CyberLeo Kitsana - cyberleo
abb074f
Commits on Oct 05, 2009
@lem9 lem9 bug [structure] "In use" table incorrectly reported as "view" 6492668
Commits on Oct 12, 2009
@lem9 lem9 [security] XSS and SQL injection 9237c4c
@lem9 lem9 [security] XSS and SQL injection 18fd6b9
@lem9 lem9 [security] XSS and SQL injection deb1b31
@lem9 lem9 [security] XSS and SQL injection 212daad
@lem9 lem9 improved escaping, thanks to Herman van Rink 164c605
@lem9 lem9 3.2.2.1 release da8fe67
@lem9 lem9 2.11.9.6 release 628b383
Commits on Oct 16, 2009
@helmo helmo backported bug #2879909 to QA_3_2 0e56d08
Commits on Oct 17, 2009
@lem9 lem9 bug #2868328 [relations] Adding foreign key when table name contains …
…a dot
140811b
Commits on Oct 23, 2009
@lem9 lem9 bug #2883381 [doc] Side effects of MemoryLimit setting 27cf08a
Commits on Oct 24, 2009
@lem9 lem9 bug #2826128 [display] Inverting sort order when expression contains …
…a function name
9f97516
@lem9 lem9 undefined variable e0c4dbd
@lem9 lem9 sort_tbl is sometimes empty b15f605
@lem9 lem9 3.2.4-dev 4cb5ade
@lem9 lem9 3.2.3-rc1 c5209b9
Commits on Oct 30, 2009
@lem9 lem9 3.2.3 release fd9e3d6
@lem9 lem9 3.2.3 release e53f38a
@lem9 lem9 MD5 sums are again in RSS feed from sf.net. bc5d423
@lem9 lem9 MD5 sums are again in RSS feed from sf.net. 4aa59d9
Commits on Oct 31, 2009
@lem9 lem9 bug [engines] Innodb_buffer_pool_pages_latched no longer returned in …
…status
f4bce10
Commits on Nov 02, 2009
@lem9 lem9 bug #2890451 [setup] Inconsistent generated "designer_coords" 010ed6d
@lem9 lem9 bug #2890443 [mysqli] "No index used in query" exception is reported 099ac98
Commits on Nov 03, 2009
@lem9 lem9 better default for Export "asfile" 07ec824
Commits on Nov 05, 2009
@lem9 lem9 bug #2891250 [ob] Garbled data in navi frame (PHP 5.2.11 bug) 344d86b
Commits on Nov 08, 2009
@lem9 lem9 bug #2894015 - typo b5d6d4b
@lem9 lem9 bug #2887357 [core] Slow loading times with large databases (partial …
…fix)
caaf02a
@lem9 lem9 bug #2893931 [lang] Typo and empty message 546b6d5
@lem9 lem9 Russian update 3d34c72
Commits on Nov 09, 2009
@lem9 lem9 add AllowNoPassword in the sample config file to help people change i…
…t to match the default behavior of a newly-installed MySQL server
ffa7b18
Commits on Nov 10, 2009
@helmo helmo Backported #2823599 UUID Primary Key wrongly updated 6ada09d
@nijel nijel Greek language fixes, thanks to George Birbilis. ae360e4
Commits on Nov 13, 2009
@lem9 lem9 bug #2895894 [structure] Empty default value not set properly 5aced34
Commits on Nov 15, 2009
@lem9 lem9 bug #2897536 [parser] Copying table with bit field with default 483e26d
Commits on Nov 21, 2009
@lem9 lem9 bug #2893221 [core] Statement may not be safe to log in statement format ee6309a
Commits on Nov 23, 2009
@lem9 lem9 3.2.5-dev e97be9a
@lem9 lem9 3.2.4-rc1 2f986ea
Commits on Nov 25, 2009
@lem9 lem9 patch #2903400 [bookmarks] Status of bookmark table 53ba442
Commits on Nov 28, 2009
@lem9 lem9 bug [history] QueryHistoryDB is not respected a1957c6
Commits on Nov 29, 2009
@lem9 lem9 bug #2905629 [auth] Blowfish secret is not hashed f1d7197
Commits on Dec 02, 2009
@lem9 lem9 3.2.4 release 49dcfdd
@lem9 lem9 3.2.4 release 2d441d7
Commits on Dec 07, 2009
@nijel nijel [setup] avoid usage of (un)serialize, what might be unsafe in some cases 719e0dc
@lem9 lem9 2.11.11-dev 13fc94b
@lem9 lem9 2.11.10 release 8535d48
Commits on Dec 09, 2009
@lem9 lem9 bug #2910000 [gui] ShowServerInfo should hide all server info from ma…
…in page
0797eb4
Commits on Dec 13, 2009
@lem9 lem9 bug 2910568 [structure] Table size for ARCHIVE tables is not displayed 8ba0a2c
Commits on Dec 17, 2009
@lem9 lem9 patch #2899969 [core] Session lock blocks working from a second window 6ec65aa
@lem9 lem9 patch #2915168 [import] Incorrect parsing of DELIMITER keyword cc96cb9
Commits on Dec 22, 2009
@lem9 lem9 patch #2918831 [export] Missing backquotes on reserved words 1dfeb3f
Commits on Dec 28, 2009
@helmo helmo [core] Fix broken cleanup of $_GET 9c5bdc0
@helmo helmo [core] Fix broken cleanup of $_GET f175026
Commits on Jan 01, 2010
@lem9 lem9 bug #2924357 [operations] Cannot rename a database that has foreign k…
…ey constraints
da78a5b
Commits on Jan 03, 2010
@lem9 lem9 Action should always be displayed here 00bf542
@lem9 lem9 bug #869006 Ignore number of records for MRG_MyISAM b07b5eb
Commits on Jan 04, 2010
@lem9 lem9 3.2.6-dev 49fbac3
@lem9 lem9 3.2.5-rc1 ede3007
Commits on Jan 05, 2010
@lem9 lem9 "Show BLOB contents" should display HTML code that is present in a BLOB 6500338
@lem9 lem9 "Show BLOB contents" should display HTML code that is present in a BLOB ff038c7
Commits on Jan 06, 2010
@helmo helmo [privileges] Improve escaping of hostname 2e8fd87
@helmo helmo [privileges] Improve escaping of hostname 3ee79f9
@lem9 lem9 3.5.2-rc2 fef74df
Commits on Jan 07, 2010
@nijel nijel Fix typo, thanks to Thijs Kinkhorst for noticing. 882cd4b
@nijel nijel Fix typo, thanks to Thijs Kinkhorst for noticing. 1cf0a6d
@nijel nijel Fix typo, thanks to Thijs Kinkhorst for noticing. d4324b7
Commits on Jan 10, 2010
@lem9 lem9 3.2.5 b3731bc
@lem9 lem9 3.2.5 d72c9eb
Commits on Jan 20, 2010
@lem9 lem9 bug #2931216 Relations settings not updated on config change 6951df8
Commits on Jan 21, 2010
@lem9 lem9 revert fix for bug #2931216 eb23564
Commits on Jan 24, 2010
@lem9 lem9 bug #2938492 information_schema sorting order c6da7d9
Commits on Jan 31, 2010
@lem9 lem9 bug #2941101 import timeout when table already created and several da…
…ta lines
e259a69
Commits on Feb 03, 2010
@helmo helmo bug #2944069 [config] Extraneus dot from dirname() when installed in …
…root, thanks to ayanamist
585ec35
Commits on Mar 11, 2010
@nijel nijel Merge remote branch 'origin/MAINT_2_11_10' into QA_2_11
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
8ae41bb
Commits on Aug 18, 2010
@lem9 lem9 Fix XSS on delimiter in db_sql.php. 4951fd1
@nijel nijel Fix XSS on delimiter in tbl_sql.php. 110c44a
@nijel nijel Secure handling of sort_by and sort_order in server_databases.php. 08e27b8
@nijel nijel Fix handling of unknown sort order. c910f4c
@nijel nijel Add option to escape PMA_sanitize output.
This is required when it is used in form values.
c69fca5
@nijel nijel Escape html chars in form values. a4a54da
@nijel nijel Document PMA_sanitize. 0fe3023
@nijel nijel Fix XSS on dbname. 8b8ce64
@nijel nijel Fix XSS on tablename and pred_tablename. 1fe1aa6
@nijel nijel Fix XSS on username. 8b7f07c
@nijel nijel Fix XSS on hostname. a7c004d
Commits on Aug 19, 2010
@nijel nijel Properly escape key name when generating config file. 30c83ac
Commits on Aug 20, 2010
@nijel nijel Fix XSS with $cfg['SQP']['fmtType'] = 'text'. 4a50055
@helmo helmo Fix XSS on error with very long query. 0fd0512
@nijel nijel Fix possible XSS on IIS redirect page. 2051a86
@nijel nijel Avoid information disclossure on error. e7d10a6
@nijel nijel Escape error message coming from MySQL to avoid XSS on bad parameters. a88dbaf
@nijel nijel Changelog. 437e00e
@nijel nijel Set version to 2.11.10.1. b1cb559
@nijel nijel Merge branch 'MAINT_2_11_10' into QA_2_11
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
c1865ca
Commits on Aug 30, 2010
@nijel nijel bug #3054458 [core] Fixed displaying number of rows. 20c8780
Commits on Aug 31, 2010
@lem9 lem9 2.11.11-rc1 0e4369a
@lem9 lem9 2.11.12-dev 510a5c0
Commits on Sep 01, 2010
@nijel nijel Merge branch 'MAINT_2_11_11' into QA_2_11 5341872
@nijel nijel Update year. 134cbbd
Commits on Sep 07, 2010
@lem9 lem9 2.11.11 release e6aeaf1
@lem9 lem9 2.11.11 release b073a5a
Commits on Sep 08, 2010
@nijel nijel Merge branch 'MAINT_2_11_11' into QA_2_11 8b2f1bc
Commits on Sep 16, 2010
@nijel nijel Polish update (#3062617). 80766a9
Commits on Nov 26, 2010
@helmo helmo bug #3115519: fixed XSS on search e1f4901
@lem9 lem9 ChangeLog for XSS search 21f624a
@helmo helmo bug #3115519: fixed XSS on search 3756112
@lem9 lem9 fix merge conflicts 6821353
@helmo helmo bug #3115519: fixed XSS on search 4341818
@lem9 lem9 ChangeLog for XSS fix 38547be
@lem9 lem9 2.11.11.1 release a6e7939
@lem9 lem9 3.3.8.1 release fcc0499
Commits on Nov 29, 2010
@lem9 lem9 2.11.11.1 release date and PMASA ref 61d9e56
@lem9 lem9 3.3.8.1 release date and PMASA ref 1507989
Commits on Jan 06, 2011
@nijel nijel Remove error.php
Redirecting to other script introduces possibility of inject custom
messages to it. Though there is no clear security issue in this, it
might confuse users and mistake them to go to external site as it allows
to include links.

Conflicts:

	error.php
	libraries/core.lib.php
b01a581
@nijel nijel Merge remote branch 'origin/MAINT_2_11_11' into QA_2_11 3f9fd25
@nijel nijel Add .gitignore from master. 60bdae6
@nijel nijel Do not load common with PMA_MINIMUM_COMMON
Defining PMA_MINIMUM_COMMON skips authentication, what should not be
done for this file.
373a662
Commits on Feb 08, 2011
@helmo helmo PMASA-2011-1 fixes 87fad58
@lem9 lem9 2.11.11.2 release 448940b
@helmo helmo PMASA-2011-1 fixes f0e8849
@lem9 lem9 ChangeLog for 2.11.11.2 d620aaf
@nijel nijel Merge remote branch 'origin/MAINT_2_11_11' into QA_2_11 79a4e4b
Commits on Feb 11, 2011
@nijel nijel Avoid using all users query as default when browsing. 2fa4c8d
@nijel nijel Merge branch 'MAINT_2_11_11' into QA_2_11 6488ee4
@nijel nijel Force bookmark ID to be integer dd60d67
@nijel nijel Merge branch 'MAINT_2_11_11' into QA_2_11 fffee91
@lem9 lem9 2.11.11.3 ChangeLog cc02c4a
@lem9 lem9 2.11.11.3 ChangeLog 715ba42
@lem9 lem9 2.11.11.3 release 92ba791
Commits on Feb 12, 2011
@lem9 lem9 Reference to minor security fixes 3b6d78a
Commits on Feb 14, 2011
@nijel nijel Merge branch 'MAINT_2_11_11' into QA_2_11 cd14795
Commits on May 20, 2011
@lem9 lem9 3.3.10.1 6eae88e
Commits on Jun 29, 2011
@helmo helmo Fixed possible session corruption in swekey authentication 6e6e129
@helmo helmo Fixed possible code injection incase session variables are compromised 2e01647
Commits on Jun 30, 2011
@helmo helmo Fixed regexp quoting issue in Synchronize code ca74f48
@helmo helmo Updated Changelog to add PMASA references 911a833
@helmo helmo Fixed filtering of a file path, which allowed for directory traversal…
…, see PMASA-2011-8
5ee357a
Commits on Jul 03, 2011
@lem9 lem9 3.3.10.2 release ab31a25
@lem9 lem9 Merge branch 'MAINT_3_3_10' into QA_3_3 b8be5eb
@lem9 lem9 3.3.10.2 release 1d60fb6
Commits on Jul 12, 2011
@helmo helmo [security] Fixed possible session manipulation in swekey authenticati…
…on, see PMASA-2011-12
f6f6ee3
@nijel nijel Pass token along with swekey auth requests 630b826
Commits on Jul 22, 2011
@helmo helmo Backported fix for PMASA-2011-9 to 3.3 8ac8328
@helmo helmo Updated/fixed Changelog 2254a70
Commits on Jul 23, 2011
@lem9 lem9 3.3.10.3 release date 6cb0ad8
@lem9 lem9 Fix merge conflicts 8a5c5c8
@lem9 lem9 3.3.10.3 release 3e95b08
Commits on Aug 08, 2011
@helmo helmo XSS fixes a6c8a8f
@helmo helmo XSS fixes c78da15
@helmo helmo XSS fixes 9d54e57
@helmo helmo Make better use of PMA_generate_common_url to prevent XSS e11e55c
Commits on Aug 18, 2011
@lem9 lem9 Sanitize filenames before using in Content-Disposition header ae20845
Commits on Aug 19, 2011
@helmo helmo Slightly far fetched XSS prevention a5716cb
@helmo helmo Missing sanitization on the table, column and index names leads to XS…
…S vulnerabilities, see PMASA-2011-13
c793755
Commits on Aug 24, 2011
@lem9 lem9 Merge branch 'MAINT_3_3_10' into QA_3_3 555e0db
@lem9 lem9 ChangeLog for 3.3.10.4 6aefed1
@lem9 lem9 Merge branch 'MAINT_3_3_10' into QA_3_3 be8cb6c
@lem9 lem9 ChangeLog for 3.3.10.4 a60420a
@lem9 lem9 3.3.10.4 release bd92c09
Commits on Nov 10, 2011
@lem9 lem9 Fix merge conflicts e3d3ef7
@nijel nijel Disable loading of external XML entities when loading XML
Fixes CVE-2011-4107
5fa86b8
@nijel nijel Disable XML loading plugins on old PHP
When libxml_disable_entity_loader is not available, we can not guarantee
safe handling of XML data.
2fbf631
@lem9 lem9 ChangeLog for 3.3.10.5 1a89c8e
@lem9 lem9 New PHP requirements for XML and ODS importing 75606e5
@lem9 lem9 Merge branch 'MAINT_3_3_10' into QA_3_3 4bd5476
@lem9 lem9 3.3.10.5 release 6f982a1
@lem9 lem9 3.3.10.5 release c96500f
Commits on Apr 11, 2012
@madhuracj madhuracj Translated using Weblate. 5a98417
@nijel nijel Merge remote-tracking branches 'origin/MAINT_2_10_0', 'origin/MAINT_2…
…_10_2' and 'origin/MAINT_2_10_3' into QA_2_10
977ec6f
@nijel nijel Merge remote-tracking branches 'origin/MAINT_2_11_0', 'origin/MAINT_2…
…_11_1', 'origin/MAINT_2_11_10', 'origin/MAINT_2_11_11', 'origin/MAINT_2_11_2', 'origin/MAINT_2_11_3', 'origin/MAINT_2_11_4', 'origin/MAINT_2_11_5', 'origin/MAINT_2_11_6', 'origin/MAINT_2_11_7', 'origin/MAINT_2_11_8' and 'origin/MAINT_2_11_9' into QA_2_11
828d01d
@nijel nijel Merge remote-tracking branches 'origin/MAINT_2_9_0', 'origin/MAINT_2_…
…9_1' and 'origin/MAINT_2_9_2' into QA_2_9
62306d3
@nijel nijel Merge remote-tracking branches 'origin/MAINT_3_0_0' and 'origin/MAINT…
…_3_0_1' into QA_3_0
d972e71
@nijel nijel Merge remote-tracking branches 'origin/MAINT_3_1_0', 'origin/MAINT_3_…
…1_1', 'origin/MAINT_3_1_2', 'origin/MAINT_3_1_3', 'origin/MAINT_3_1_4' and 'origin/MAINT_3_1_5' into QA_3_1
1ff6ab9
@nijel nijel Merge remote-tracking branches 'origin/MAINT_3_2_0', 'origin/MAINT_3_…
…2_2', 'origin/MAINT_3_2_3', 'origin/MAINT_3_2_4' and 'origin/MAINT_3_2_5' into QA_3_2
a1ff927
@nijel nijel Merge remote-tracking branches 'origin/MAINT_3_3_0', 'origin/MAINT_3_…
…3_1', 'origin/MAINT_3_3_10', 'origin/MAINT_3_3_2', 'origin/MAINT_3_3_3', 'origin/MAINT_3_3_4', 'origin/MAINT_3_3_5', 'origin/MAINT_3_3_6', 'origin/MAINT_3_3_7', 'origin/MAINT_3_3_8' and 'origin/MAINT_3_3_9' into QA_3_3
a6c4ea2
@nijel nijel Merge branch 'QA_2_9' into QA_2_10 b09cad4
@nijel nijel Merge branch 'QA_2_10' into QA_2_11 fa27f37
@nijel nijel Merge branch 'QA_2_11' into QA_3_0 8a7cf50
@nijel nijel Merge branch 'QA_3_0' into QA_3_1 753e526
@nijel nijel Merge branch 'QA_3_1' into QA_3_2 be3108b
@nijel nijel Merge branch 'QA_3_2' into QA_3_3 e6f5e92
@nijel nijel Merge branch 'QA_3_3' into QA_3_4 15e1584
@lem9 lem9 3.4.11-rc1 591d151
Commits on Apr 14, 2012
@lem9 lem9 3.4.11 release 3345d64
@lem9 lem9 Merge branch 'QA_3_4' into MAINT_3_5_0 7738ec9
@lem9 lem9 Fix merge conflicts ea17cef
Something went wrong with that request. Please try again.