Merge remote branch 'kinlo/servername'
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 00:18:36 +0000 (20:18 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 00:18:36 +0000 (20:18 -0400)
commitc7948752d9f8dc26b4d54ddaa04f3515fba7273e
tree907a504bff00029e01c3ef79a93e040356c413e8
parentf66609fd3e78130d539a73683a6e958ae0c88f84
parentf8b976a53fefc18ab5b7d874f91a5cf46ce37639
Merge remote branch 'kinlo/servername'