Merge branch 'unstable' into loadable-websocket-support
[guacamole.git] / ChangeLog
2011-12-19 Michael JumperAdded changelog