Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:17:50 +0000 (23:17 +0000)
committerIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:17:50 +0000 (23:17 +0000)
commit04da1cb11cf8285b944492aaa636dbd596ed5e74
tree3f65e97adb64a4bd5a9ed54de78d026c0b704bba
parent663c9481f177dae836707e40512d9af8c21d9fa5
parent64911207854610668b480939469282fdaeb96f74
Merge branch 'upstream' into stable