2e290b1cb6 
								
							 
						 
						
							
							
								
								Templates - provide button to reload template details  
							
							... 
							
							
							
							Bugzilla Id: 55236
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1502028  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 09a45adda4 
							
						 
						
							2013-07-10 22:03:33 +00:00  
				
					
						
							
							
								 
						
							
								21925c9acc 
								
							 
						 
						
							
							
								
								Start of new and noteworthy  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1502008  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: dbae8c3adf 
							
						 
						
							2013-07-10 21:21:09 +00:00  
				
					
						
							
							
								 
						
							
								1de486c4f7 
								
							 
						 
						
							
							
								
								Change list Known bugs to bullet list.  
							
							... 
							
							
							
							Add mention to Java Bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6396599  for Java/Linux issue.
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1501695  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 5f7422ecd3 
							
						 
						
							2013-07-10 09:43:05 +00:00  
				
					
						
							
							
								 
						
							
								af5ee61553 
								
							 
						 
						
							
							
								
								ViewResultsTree: text not refitted if vertical scrollbar is required  
							
							... 
							
							
							
							Bugzilla Id: 55111
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1501661  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: d2551f6710 
							
						 
						
							2013-07-10 07:15:43 +00:00  
				
					
						
							
							
								 
						
							
								f03b754bff 
								
							 
						 
						
							
							
								
								Add syntax color for scripts elements (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea  
							
							... 
							
							
							
							(add mention to JDBC)
Bugzilla Id: 55202
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1501327  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 9aabd38fcb 
							
						 
						
							2013-07-09 15:16:58 +00:00  
				
					
						
							
							
								 
						
							
								54a18bf71e 
								
							 
						 
						
							
							
								
								& needs to be double-escaped because the xml is processed twice  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500998  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: ee8dcd258c 
							
						 
						
							2013-07-08 22:40:04 +00:00  
				
					
						
							
							
								 
						
							
								70e5a30427 
								
							 
						 
						
							
							
								
								Bug 55175 - HTTPHC4Impl refactoring to allow better inheritance  
							
							... 
							
							
							
							Bugzilla Id: 55175
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500926  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 03b2067b60 
							
						 
						
							2013-07-08 20:11:00 +00:00  
				
					
						
							
							
								 
						
							
								b08546f3b7 
								
							 
						 
						
							
							
								
								fixed some typos  
							
							... 
							
							
							
							Clarified some unclear bugs
fixed ? appearing instead of quotes
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500665  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 41c9fc77a2 
							
						 
						
							2013-07-08 11:29:22 +00:00  
				
					
						
							
							
								 
						
							
								d3d2bc7f9d 
								
							 
						 
						
							
							
								
								Spelling etc  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500557  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: c3fa9c850f 
							
						 
						
							2013-07-08 00:49:15 +00:00  
				
					
						
							
							
								 
						
							
								fa9aa6462c 
								
							 
						 
						
							
							
								
								TestBeanGUI - wrong language settings found  
							
							... 
							
							
							
							Bugzilla Id: 55203
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500556  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 12317a525a 
							
						 
						
							2013-07-08 00:47:58 +00:00  
				
					
						
							
							
								 
						
							
								87c70a1746 
								
							 
						 
						
							
							
								
								Updated to tika 1.4 (from 1.3)  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500508  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: e0a38bd153 
							
						 
						
							2013-07-07 19:15:31 +00:00  
				
					
						
							
							
								 
						
							
								6d175d26b5 
								
							 
						 
						
							
							
								
								JSR223 language entries are duplicated; fold to lower case  
							
							... 
							
							
							
							Bugzilla Id: 55208
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500358  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 2cbf789bb2 
							
						 
						
							2013-07-07 02:46:20 +00:00  
				
					
						
							
							
								 
						
							
								6978ae6268 
								
							 
						 
						
							
							
								
								Bug 55202 - Proposal to add RSyntaxTextArea for BeanShell, BSF, and JSR223 elements  
							
							... 
							
							
							
							Bugzilla Id: 55202
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500124  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 662af67229 
							
						 
						
							2013-07-05 20:39:54 +00:00  
				
					
						
							
							
								 
						
							
								7d40ece98c 
								
							 
						 
						
							
							
								
								Bug 55201 - ForEach controller excludes start index and includes end index (clarified documentation)  
							
							... 
							
							
							
							Bugzilla Id: 55201
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1500053  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 94f813ea45 
							
						 
						
							2013-07-05 16:08:22 +00:00  
				
					
						
							
							
								 
						
							
								749feb2044 
								
							 
						 
						
							
							
								
								Integer overflow when computing ONE_YEAR_MS in HTTP CacheManager  
							
							... 
							
							
							
							Bugzilla Id: 55187
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1499938  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 9a258e47ed 
							
						 
						
							2013-07-05 08:35:52 +00:00  
				
					
						
							
							
								 
						
							
								7c8c90bd50 
								
							 
						 
						
							
							
								
								Bug 55172 - Provide plugins a way to add Top Menu and menu items  
							
							... 
							
							
							
							Bugzilla Id: 55172
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1498398  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: a034d3ec15 
							
						 
						
							2013-07-01 12:06:02 +00:00  
				
					
						
							
							
								 
						
							
								d9aae666b1 
								
							 
						 
						
							
							
								
								BeanShellTestElement faiils to quote string when calling testStarted(String)/testEnded(String)  
							
							... 
							
							
							
							Bugzilla Id: 55163
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1498134  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: d1aa4897db 
							
						 
						
							2013-06-30 14:38:34 +00:00  
				
					
						
							
							
								 
						
							
								ba549a7969 
								
							 
						 
						
							
							
								
								fixed typo  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1498130  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: fce8a4c580 
							
						 
						
							2013-06-30 14:25:51 +00:00  
				
					
						
							
							
								 
						
							
								6180a203d9 
								
							 
						 
						
							
							
								
								Bug 54950 - ModuleController : Changes to referenced Module are not taken into accound if changes occur after first run and referenced node is disabled  
							
							... 
							
							
							
							Bugzilla Id: 54950
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1498127  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: db14be3c10 
							
						 
						
							2013-06-30 14:11:15 +00:00  
				
					
						
							
							
								 
						
							
								2ca537b26b 
								
							 
						 
						
							
							
								
								Bug 55161 - Useless processing in SoapSampler.setPostHeaders  
							
							... 
							
							
							
							Bugzilla Id: 55161
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1498110  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 697113b02b 
							
						 
						
							2013-06-30 13:00:30 +00:00  
				
					
						
							
							
								 
						
							
								938ac933d5 
								
							 
						 
						
							
							
								
								Upgrade of libraries:  
							
							... 
							
							
							
							commons-logging-1.1.3
commons-net-3.3
jodd-3.4.4
mongo-java-driver-2.11.2
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1498027  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 1726298f1f 
							
						 
						
							2013-06-29 21:05:25 +00:00  
				
					
						
							
							
								 
						
							
								4fe05e3764 
								
							 
						 
						
							
							
								
								Bug 55085 - UX Improvement : Ability to create New Test Plan from Templates  
							
							... 
							
							
							
							Bugzilla Id: 55085
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1498018  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: f184d4a74d 
							
						 
						
							2013-06-29 20:08:15 +00:00  
				
					
						
							
							
								 
						
							
								8b0c3414cc 
								
							 
						 
						
							
							
								
								Change Javadoc generation per CVE-2013-1571, VU#225657  
							
							... 
							
							
							
							Bugzilla Id: 55129
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1495899  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 7a9b3f02a7 
							
						 
						
							2013-06-23 23:08:54 +00:00  
				
					
						
							
							
								 
						
							
								a8a2ccb2c3 
								
							 
						 
						
							
							
								
								Bug 54903 - Remove the dependency on the Activation Framework  
							
							... 
							
							
							
							Bugzilla Id: 54903
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1493407  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: e8efec46d5 
							
						 
						
							2013-06-15 19:17:31 +00:00  
				
					
						
							
							
								 
						
							
								d0c731aac0 
								
							 
						 
						
							
							
								
								Bug 55092 - Log message "WARN - jmeter.protocol.http.sampler.HTTPSamplerBase: Null URL detected (should not happen)" displayed when embedded resource URL is malformed  
							
							... 
							
							
							
							Bugzilla Id: 55092
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1493403  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 9f32ffdc26 
							
						 
						
							2013-06-15 17:21:30 +00:00  
				
					
						
							
							
								 
						
							
								a26ea01b0d 
								
							 
						 
						
							
							
								
								Bug 55084 - Add timeout support for JDBC Request  
							
							... 
							
							
							
							Bugzilla Id: 55084
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1491213  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 8b6438ad9b 
							
						 
						
							2013-06-09 13:07:32 +00:00  
				
					
						
							
							
								 
						
							
								76fcc91db2 
								
							 
						 
						
							
							
								
								Bug 55065 - wasted work in Spline3.converge()  
							
							... 
							
							
							
							Bug renaming 
Bugzilla Id: 55065
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1490009  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 1e75d8a178 
							
						 
						
							2013-06-05 19:06:31 +00:00  
				
					
						
							
							
								 
						
							
								6101867d68 
								
							 
						 
						
							
							
								
								Bug 55064 - Useless processing in ReportTreeListener.isValidDragAction()  
							
							... 
							
							
							
							Bugzilla Id: 55064
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1490008  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: c67d8701bb 
							
						 
						
							2013-06-05 19:04:42 +00:00  
				
					
						
							
							
								 
						
							
								0d89fa0cce 
								
							 
						 
						
							
							
								
								Bug 55065 - wasted work in Spline3.converge()  
							
							... 
							
							
							
							Bugzilla Id: 55065
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1490003  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 386d7a43ca 
							
						 
						
							2013-06-05 18:59:09 +00:00  
				
					
						
							
							
								 
						
							
								0f4b3ff174 
								
							 
						 
						
							
							
								
								wasted work in Data.append()  
							
							... 
							
							
							
							Bugzilla Id: 55056
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1489490  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 6ba2d9d111 
							
						 
						
							2013-06-04 15:59:02 +00:00  
				
					
						
							
							
								 
						
							
								beebaf78ef 
								
							 
						 
						
							
							
								
								SSL Context reuse feature (51380) adversely affects non-ssl request performance/throughput  
							
							... 
							
							
							
							Move testIterationStart code to samplers that actually need it; allows it to be done on first actual sample
Bugzilla Id: 55023
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1489189  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 107624fad3 
							
						 
						
							2013-06-03 21:35:55 +00:00  
				
					
						
							
							
								 
						
							
								1de4e58599 
								
							 
						 
						
							
							
								
								Bug 54985 - Make Transaction Controller set Response Code of Generated Parent Sampler to response code of first failing child in case of failure of one of its children  
							
							... 
							
							
							
							Bugzilla Id: 54985
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1489182  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 5ec765ec38 
							
						 
						
							2013-06-03 21:19:07 +00:00  
				
					
						
							
							
								 
						
							
								f827bde3d5 
								
							 
						 
						
							
							
								
								Bug 55027 - Test Action regression, duration value are not record  
							
							... 
							
							
							
							Bugzilla Id: 55027
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1487615  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: ae40b4e00e 
							
						 
						
							2013-05-29 19:53:36 +00:00  
				
					
						
							
							
								 
						
							
								4412672843 
								
							 
						 
						
							
							
								
								Download large files avoiding outOfMemory  
							
							... 
							
							
							
							Add utility method to do chunking and use in ResultSaver
Bugzilla Id: 54990
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1484366  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: e1c293599f 
							
						 
						
							2013-05-19 23:21:23 +00:00  
				
					
						
							
							
								 
						
							
								0f23dee82a 
								
							 
						 
						
							
							
								
								Add functions to encode/decode URL encoded chars (__urlencode and __urldecode)  
							
							... 
							
							
							
							Bugzilla Id: 54991
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1484160  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 2263e26b12 
							
						 
						
							2013-05-18 18:23:07 +00:00  
				
					
						
							
							
								 
						
							
								d3a0333167 
								
							 
						 
						
							
							
								
								Small user interaction improvements in Row parameter Detail Box  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1484159  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: c3e49f1fe7 
							
						 
						
							2013-05-18 18:18:44 +00:00  
				
					
						
							
							
								 
						
							
								49e6b4857a 
								
							 
						 
						
							
							
								
								Bug 54945 - Add Shutdown Hook to enable trapping kill or CTRL+C signals  
							
							... 
							
							
							
							Bugzilla Id: 54945
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1480762  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: fa01ece63c 
							
						 
						
							2013-05-09 20:32:55 +00:00  
				
					
						
							
							
								 
						
							
								23f99c2815 
								
							 
						 
						
							
							
								
								Removal from GUI of Deprecated of Webservice SOAP Request  
							
							... 
							
							
							
							Fixed HTML Parameter Mask not being removed from GUI due to change in label
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1480463  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 7c7edbccff 
							
						 
						
							2013-05-08 21:08:53 +00:00  
				
					
						
							
							
								 
						
							
								fe743947dd 
								
							 
						 
						
							
							
								
								Updated to commons-codec 1.8 (from 1.6)  
							
							... 
							
							
							
							Updated to commons-io 2.4 (from 2.2)
Updated to commons-net 3.2 (from 3.1)
Updated to jdom-1.1.3 (from 1.1.2)
Updated to jodd-lagarto and jodd-core 3.4.3 (from 3.4.1)
Updated to junit 4.11 (from 4.10)
Updated to slf4j-api 1.7.5 (from 1.7.2)
Updated to xmlgraphics-commons 1.5 (from 1.3.1)
Updated to xstream 1.4.4 (from 1.4.2)
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1480444  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 10c1830d92 
							
						 
						
							2013-05-08 20:39:12 +00:00  
				
					
						
							
							
								 
						
							
								cd5cb20c60 
								
							 
						 
						
							
							
								
								Bug 54924 - XMLAssertion uses JMeter JVM file.encoding instead of response encoding and does not clean threadlocal variable  
							
							... 
							
							
							
							Bugzilla Id: 54924
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1478975  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: f3dac24c9f 
							
						 
						
							2013-05-03 20:51:47 +00:00  
				
					
						
							
							
								 
						
							
								60af77c2bd 
								
							 
						 
						
							
							
								
								Bug 54913 - JMSPublisherGui incorrectly restore its state  
							
							... 
							
							
							
							Bugzilla Id: 54913
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1477850  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 0da3ba6db7 
							
						 
						
							2013-04-30 21:46:34 +00:00  
				
					
						
							
							
								 
						
							
								d7fdd1f4a1 
								
							 
						 
						
							
							
								
								Bug 54912 - JMeterTreeListener should use constants  
							
							... 
							
							
							
							Bugzilla Id: 54912
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1477844  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 80a9a5cdfb 
							
						 
						
							2013-04-30 21:40:49 +00:00  
				
					
						
							
							
								 
						
							
								58a7746e31 
								
							 
						 
						
							
							
								
								upgrade to httpclient 4.2.5  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1477809  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: c31f91a4d5 
							
						 
						
							2013-04-30 20:24:43 +00:00  
				
					
						
							
							
								 
						
							
								2e981202eb 
								
							 
						 
						
							
							
								
								Bug 54901 - Response Assertion GUI behaves weirdly  
							
							... 
							
							
							
							Bugzilla Id: 54901
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1476828  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: a131b7918f 
							
						 
						
							2013-04-28 20:26:06 +00:00  
				
					
						
							
							
								 
						
							
								1cb74b86d4 
								
							 
						 
						
							
							
								
								Bug 54896 - JUnit sampler gives only “failed to create an instance of the class” message with constructor problems  
							
							... 
							
							
							
							Bugzilla Id: 54896
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1476768  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 26c54f46c7 
							
						 
						
							2013-04-28 13:55:43 +00:00  
				
					
						
							
							
								 
						
							
								3723c3205e 
								
							 
						 
						
							
							
								
								Bug 54870 - Tree D&D may lost leaf nodes  
							
							... 
							
							
							
							Bugzilla Id: 54870
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1470027  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 22ce57a68b 
							
						 
						
							2013-04-19 20:31:01 +00:00  
				
					
						
							
							
								 
						
							
								f120e5128f 
								
							 
						 
						
							
							
								
								Bug 54864 - Enable multi selection drag&drop in the tree without having to start dragging before releasing Shift or Control  
							
							... 
							
							
							
							Bugzilla Id: 54864
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1469553  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 8a3c9d4dcc 
							
						 
						
							2013-04-18 20:30:06 +00:00  
				
					
						
							
							
								 
						
							
								4d72c17e0a 
								
							 
						 
						
							
							
								
								Bug 54834 - Improve Drag & Drop in the jmeter tree  
							
							... 
							
							
							
							fix entity
Bugzilla Id: 54834
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1469066  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 5b144c0e56 
							
						 
						
							2013-04-17 20:41:44 +00:00  
				
					
						
							
							
								 
						
							
								b3e9da9d44 
								
							 
						 
						
							
							
								
								Bug 54834 - Improve Drag & Drop in the jmeter tree  
							
							... 
							
							
							
							Bugzilla Id: 54834
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1469057  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 0adec3b67f 
							
						 
						
							2013-04-17 20:16:53 +00:00  
				
					
						
							
							
								 
						
							
								f13c929032 
								
							 
						 
						
							
							
								
								More info on why change was done  
							
							... 
							
							
							
							git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1468543  13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 9d5906a1d0 
							
						 
						
							2013-04-16 18:24:22 +00:00