[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-221-g3706ab5

[jasonwryan]

The following commit has been merged in the master branch:
commit 3706ab5d9096116499672c5b1cbdaefbd87e125b
Merge: 9b144804c2108516a37a9c37fae450a61f542b62 9f335f21fcba4436f8a8feb14d088f0bad7d057e
Author: jasonwryan <jasonwryan at gmail.com>
Date:   Fri Jun 1 15:44:24 2012 +1200

    Merge ssh://git.debian.org/git/surfraw/surfraw
    
    Conflicts:
    	ChangeLog

diff --combined ChangeLog
index e46f2d3,a879d27..ec981e1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,17 +1,21 @@@
 +2012-06-01  Jason Ryan <jasonwryan at surfraw.org>
 +
 +	* New elvi: github (search github.com)
 +
+ 2012-03-17  Ivy Foster  <joyfulgirl at archlinux.us>
+ 
+ 	* Fix a typo in duckduckgo code.
+ 
+ 2012-03-17  Ivy Foster  <joyfulgirl at archlinux.us>
+ 
+ 	* Keep duckduckgo's -l[ucky] from clobbering -lh
+ 
+ 2012-01-10  Ivy Foster  <joyfulgirl at archlinux.us>
+ 
+ 	* aur: now uses HTTPS by default
+ 	  + On the AUR, connecting via HTTP disables login.
+ 	  + Added switch -no-https to enable connection via plain HTTP
+ 
  2011-10-10  Ian Beckwith  <ianb at erislabs.net>
  
  	* surfraw.IN: test_elvi(): tweak sed regex

-- 
surfraw -  a fast unix command line interface to WWW