Merge remote-tracking branch 'upstream/master'
authorMichael Pratt <michael@pratt.im>
Sun, 8 Jul 2012 19:52:00 +0000 (15:52 -0400)
committerMichael Pratt <michael@pratt.im>
Sun, 8 Jul 2012 19:52:00 +0000 (15:52 -0400)
commitf8d3b170f974d7070a83fd6090ca5fe80aaa3420
tree5606bb1ed0c2f2664c40e856b7ed6ee0f7c84bcf
parente8601c816ae61ae0a5fa2a5c176c75e5dc523ac1
parentbbd45a33fc8e47c4c0a2c73bcbadda432b5979fa
Merge remote-tracking branch 'upstream/master'