# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1326355400 -25200
# Node ID 889bd8475ca5440899cb79848e45ec0c1b6802d2
# Parent  d55ff9c0158ad8bf3c9e4f34445dbc081e737978# Parent  c52680b34356ed104d91397ba6c13de663210ff8
Merge.

diff -r d55ff9c0158a -r 889bd8475ca5 bin/startssl-nginx
--- a/bin/startssl-nginx	Thu Jan 12 15:02:53 2012 +0700
+++ b/bin/startssl-nginx	Thu Jan 12 15:03:20 2012 +0700
@@ -7,9 +7,9 @@
 
 certfile="${1}"
 
-command -v curl 2> /dev/null || _err_fatal "This script requires cURL. Please install it first."
+command -v curl 2>&1 > /dev/null || _err_fatal "This script requires cURL. Please install it first."
 test -z "${certfile}" && _err_fatal "Please specify certificate file."
-test -f "${certfile}" && _err_fatal "Error reading certificate file ${certfile}."
+test -f "${certfile}" || _err_fatal "Error reading certificate file ${certfile}."
 
 for ca in sub.class1.server.ca.pem ca.pem; do
   curl "http://www.startssl.com/certs/${ca}" >> "${certfile}"
diff -r d55ff9c0158a -r 889bd8475ca5 rc/bash
--- a/rc/bash	Thu Jan 12 15:02:53 2012 +0700
+++ b/rc/bash	Thu Jan 12 15:03:20 2012 +0700
@@ -30,7 +30,7 @@
 alias less="less -Rins"
 alias ls="ls -F"
 alias rm="rm -i"
-alias rd="rdesktop -g 1280x600 -K -a 16 -z -P -r sound:off -r clipboard:CLIPBOARD -5"
+alias rd="rdesktop -g 1280x600 -K -a 15 -x m -z -P -r sound:off -r clipboard:CLIPBOARD -5"
 
 _has_gnu_ls=
 _has_gnu_grep=