Ken McMillan
								
							 
						 | 
						
							
							
							
							
								
							
							
								e651f45bc0
								
							
						 | 
						
							
							
								
								added sequences to get-interpolant and compute-interpolant
							
							
							
							
							
						 | 
						
							2013-04-09 15:52:30 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								f773f35517
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' into contrib
							
							
							
							
							
						 | 
						
							2013-04-09 08:44:57 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f46179def
								
							
						 | 
						
							
							
								
								reorganization of rule_set structure
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-04-08 13:50:56 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								359d2326f8
								
							
						 | 
						
							
							
								
								stash
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-04-03 17:06:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nuno Lopes
								
							 
						 | 
						
							
							
							
							
								
							
							
								67e9d74653
								
							
						 | 
						
							
							
								
								constify a few functions
							
							
							
							
							
							
							
							Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com> 
							
						 | 
						
							2013-04-03 09:44:31 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c353ec720
								
							
						 | 
						
							
							
								
								FPA: bugfix for model completion. Thanks to Levent Erkok.
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2013-04-02 13:45:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ken McMillan
								
							 
						 | 
						
							
							
							
							
								
							
							
								78848f3ddd
								
							
						 | 
						
							
							
								
								working on smt2 and api
							
							
							
							
							
						 | 
						
							2013-03-26 17:25:54 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								4385b51c84
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
							
							
							
							
							
						 | 
						
							2013-03-25 15:41:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								f32eaee62e
								
							
						 | 
						
							
							
								
								Replace std::sort with std::stable_sort when the given relation is just a partial order. This change avoids discrepancies when using different implmentations of std::sort.
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-03-25 15:40:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1fc6a5cac
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
							
							
							
							
							
						 | 
						
							2013-03-24 18:26:48 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbe93ef610
								
							
						 | 
						
							
							
								
								fix build warning, make context simplifier traverse subterms
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-03-24 18:26:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								a71bb549c6
								
							
						 | 
						
							
							
								
								Add option :bv-sort-ac true
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-03-24 14:59:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c3ca302f0
								
							
						 | 
						
							
							
								
								missing hnf
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-03-23 16:56:47 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb5d2cae17
								
							
						 | 
						
							
							
								
								local changes
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-03-23 16:44:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								26f4d3be20
								
							
						 | 
						
							
							
								
								significant update to Horn routines: add module hnf to extract Horn normal form (removed from rule_manager). Associate proof objects with rules to track (all) rewrites, so that proof traces can be tracked back to original rules after transformations
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-03-23 14:11:54 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								5455704af2
								
							
						 | 
						
							
							
								
								move quantifier hoist routines to quant_hoist
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-03-19 15:00:23 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e9f4e264d
								
							
						 | 
						
							
							
								
								working on separating horn simplificaiton
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-03-18 21:46:42 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5307300de
								
							
						 | 
						
							
							
								
								FPA: bugfixes in mul() and abs()
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2013-03-06 15:04:58 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								bdc675b1df
								
							
						 | 
						
							
							
								
								Fix bug reported at http://stackoverflow.com/questions/15226944/segmentation-fault-in-z3
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-03-05 09:04:03 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5f03f999a
								
							
						 | 
						
							
							
								
								FPA: Added conversion operator float -> float.
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2013-03-04 20:21:14 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f3850bfbc
								
							
						 | 
						
							
							
								
								FPA bug and leak fixes (thanks to Gabriele Paganelli)
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2013-02-28 18:46:29 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								70192b66e9
								
							
						 | 
						
							
							
								
								Remove dead files
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-20 17:17:11 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								97bf9418f7
								
							
						 | 
						
							
							
								
								Add new probes for arithmetic. Check for LIA and LRA (and activate qe if applicable). Modify echo tactic to send results to the regular stream.
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-20 13:41:08 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4d57e0ab1
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' into contrib
							
							
							
							
							
						 | 
						
							2013-02-19 15:35:05 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								0af4384882
								
							
						 | 
						
							
							
								
								Fix more issues unintepreted sort tests.
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-15 16:31:49 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								943e142bfa
								
							
						 | 
						
							
							
								
								Fix bug in ast_smt_pp.cpp. After user_sort_plugin was introduced, it is not that case that if a sort is uninterpreted, then sort->get_family_id() == null_family_id.
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-15 16:27:55 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2651f1afc
								
							
						 | 
						
							
							
								
								Keep consistent error messages
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-13 18:53:37 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff03da9e67
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
							
							
							
							
							
						 | 
						
							2013-02-12 15:44:32 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a15db5244
								
							
						 | 
						
							
							
								
								Fix uninterpreted sort definition. There was a mismatch in the behavior of the API and SMT front-ends. The SMT front-ends were using user_sorts to be able to support parametric uninterpreted sorts. After this fix, the API also creates user_sorts.
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-12 14:34:31 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								51314db23b
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
							
							
							
							
							
						 | 
						
							2013-02-09 10:58:44 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce9a098f16
								
							
						 | 
						
							
							
								
								local changes to pdr_generalizer
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-02-09 10:58:37 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef7bc63747
								
							
						 | 
						
							
							
								
								Fix compilation error
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-08 19:22:43 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ad43c60a9
								
							
						 | 
						
							
							
								
								working on pdr gen
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-02-08 16:54:05 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd90667cc7
								
							
						 | 
						
							
							
								
								fix pretty printer bug found by ken
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-02-08 16:32:53 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e868cdef3
								
							
						 | 
						
							
							
								
								fix pretty printer bug found by ken
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-02-08 16:04:46 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e5581b4fe
								
							
						 | 
						
							
							
								
								Retract changes in the commit 39a614559c. The fix was affecting benchmarks using the array theory map construct.
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-04 08:19:33 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								39a614559c
								
							
						 | 
						
							
							
								
								Add partial solution for the uneeded disambiguation issue raised by David Cok
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-03 15:55:36 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								c4f762028f
								
							
						 | 
						
							
							
								
								Add support for abs (absolute value) function in theory arith (it is part of the SMT-LIB 2.0 standard)
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-03 15:28:56 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								490905e320
								
							
						 | 
						
							
							
								
								Set -,/,div as left-associative (Thanks to David Cok)
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-03 15:01:43 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc8277f10d
								
							
						 | 
						
							
							
								
								Add check bv size. Bit-vector size must be greater than zero (Thanks to David Cok)
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2013-02-03 14:42:58 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								af4c09c8d3
								
							
						 | 
						
							
							
								
								update substitution routines
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-01-21 21:59:20 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9cc7080e7
								
							
						 | 
						
							
							
								
								update substitution routines
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-01-21 21:47:43 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								87e9015675
								
							
						 | 
						
							
							
								
								working on tab_context
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-01-20 18:41:41 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								8daf100c65
								
							
						 | 
						
							
							
								
								working on tab Horn solver
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-01-17 18:03:34 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca5eb5186d
								
							
						 | 
						
							
							
								
								fix pretty printer for smt2 unary minus
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-01-15 09:24:12 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a6015e335
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' into contrib
							
							
							
							
							
						 | 
						
							2012-12-31 13:48:44 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								8515044f8b
								
							
						 | 
						
							
							
								
								Add option bvnot2arith
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2012-12-27 20:28:42 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								53df82c314
								
							
						 | 
						
							
							
								
								Add arith_decls for underspecified operators
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2012-12-26 11:35:00 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a286541e0
								
							
						 | 
						
							
							
								
								Fix crash reported at http://z3.codeplex.com/workitem/11. Fix array rewriter bug, rewriter was producing sort incorrect expression.
							
							
							
							
							
							
							
							Signed-off-by: Leonardo de Moura <leonardo@microsoft.com> 
							
						 | 
						
							2012-12-26 08:36:25 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Leonardo de Moura
								
							 
						 | 
						
							
							
							
							
								
							
							
								fbce816025
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' into contrib
							
							
							
							
							
						 | 
						
							2012-12-22 14:36:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |