Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Thu, 20 Oct 2011 14:41:21 +0000 (10:41 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 20 Oct 2011 14:41:21 +0000 (10:41 -0400)
commita294ccb96b9652ddcdc7b2b7f943af88c783acb1
tree8a863ff999b58a4d2de9adf6e5bde455ebdb814c
parent9f2fa37ea9cd2e7d48c45edf08dca96202099377
parent22fead1b46118a4fcb45b20a3bce620dd3283b65
Merge branch '1.0.x'