Merge remote-tracking branch 'shane-axiom/master'

Alex Leith

2016-03-14 8383a53de200b231b029daadaf0ca9abe7d2b91d

1
2
#Acquire::http { Proxy "http://192.168.2.9:3142"; };
#Acquire::http { Proxy "http://192.168.0.101:3142"; };