merge changelog from stable
authorJesse Luehrs <doy@tozt.net>
Thu, 28 Jun 2012 16:05:43 +0000 (11:05 -0500)
committerJesse Luehrs <doy@tozt.net>
Thu, 28 Jun 2012 16:05:43 +0000 (11:05 -0500)
commitea77684a76e30c02b0cd5512e322e6e29a6ac8e3
tree60427d74cd6da8c25bec54101c75fd78e61a831c
parent312521ffdda80ab52bca2de600ea814bf4aedc4f
merge changelog from stable
Changes