xorg: capture change for jpeg mode
xrdp: for proxy modules, pass target ip to module (if ip passed-in from
client into domain field (starting with _))
xrdp: indentation fix
xorg: fix for compile with xorg 1.15
xrdp: xrdp_wm: changed the autologin logic
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel
make login screen window title configurable
remove 1 from default title string
Merge pull request #121 from cocoon/devel_window_title_config

make login screen window title configurable
common: fix for clearing environment vars in BSD
Merge branch 'devel' of github.com:neutrinolabs/xrdp into devel
chansrv: make fuse mount directory configurable

Conflicts:

	sesman/sesman.ini
sesman: more options for session lookup from Fredy Paquet
common: indent, no logic change to trans.h
pulse: fix for build with pulseaudio 4.0+
libxrdp: xrdp_channel: don't change channel flags when
CHANNEL_OPTION_SHOW_PROTOCOL flag exists.
[according to doc:
http://msdn.microsoft.com/en-us/library/cc240513.aspx]
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel