projects / guacamole-common-js.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fc033f 429ca01)
Merge remote branch 'matthortman/MBH' into merge-matt
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 5 Mar 2012 19:52:14 +0000 (11:52 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 5 Mar 2012 19:52:14 +0000 (11:52 -0800)

Trivial merge
Alex Bligh guacamole common js tree