]> git.scottworley.com Git - reliable-chat/commit
Merge skitch's changes.
authorScott Worley <sworley@chkno.net>
Fri, 3 Aug 2012 01:38:31 +0000 (18:38 -0700)
committerScott Worley <sworley@chkno.net>
Fri, 3 Aug 2012 01:38:31 +0000 (18:38 -0700)
commit99c1f307f81cc3d92541e41bab1df1f79d83517e
tree95c47e35bc1540dd0e936bae30c21f9cea99d605
parent79ced6f1d611919e0068ac2e7e8855d873f9e677
parentb22a2cedc1be7e6448f6168ce1256e87733573b4
Merge skitch's changes.

Conflicts:
webclient/rc.html
webclient/rc.html