[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
            
            
            
                9 Oct
                
                    2012
                
            
            
                9 Oct
                
                '12
                
            
            
            
        
    
                10:22 p.m.
            
        commit 115394478d1bf987b8b7a9ac43d321eb8951e669 Merge: 9a21a47 1720f15 Author: Mike Perry <mikeperry-git@fscked.org> Date: Tue Oct 9 15:12:30 2012 -0700 Merge branch 'maint-2.2' into maint-2.3
        4774
        
      
          Age (days ago)
        
      
        4774
        
    
          Last active (days ago)
        
        
        
        0 comments
    
    
        
        1 participants
    
    
    
    
    
    
    
    
    participants (1)
- 
                
mikeperry@torproject.org