Merge remote-tracking branch 'origin/master'
authorTomas Doran <bobtfish@bobtfish.net>
Fri, 17 Feb 2012 07:47:21 +0000 (07:47 +0000)
committerTomas Doran <bobtfish@bobtfish.net>
Fri, 17 Feb 2012 07:47:21 +0000 (07:47 +0000)
commit420693bab3b10796eeebd0c320d5a4596324dbba
treed29d455f17f8f5b3d9798abaa430ac338cd05bf2
parent80b49130655eceeda5f4d28b9171bfd23fb0cfa5
parent09300532e2e27e1cdd4fbcd03f0e73d84c168670
Merge remote-tracking branch 'origin/master'

* origin/master:
  Fixed wrong app name for socket in non-root config