projects / guacamole-common-js.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 718e2b5 8c6da56)
Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole...
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Fri, 18 Feb 2011 03:23:02 +0000 (19:23 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Fri, 18 Feb 2011 03:23:02 +0000 (19:23 -0800)

Trivial merge
Alex Bligh guacamole common js tree