Merge commit 'b572c3a256e7bf1e4eecc8c36448c08093240a6a' into stable
authorIan Beckwith <ianb@erislabs.net>
Sun, 11 Dec 2011 02:19:09 +0000 (02:19 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 11 Dec 2011 02:19:09 +0000 (02:19 +0000)
commit2408f02086a20c0a02241cd4a1cf11f126a95fe3
tree8d17e7c4015687f346e74cb7d99450a81730dbdf
parent1c17f62209b5536711bc5c17a7814db8eff5df25
parentb572c3a256e7bf1e4eecc8c36448c08093240a6a
Merge commit 'b572c3a256e7bf1e4eecc8c36448c08093240a6a' into stable
i.e. upstream master branch as of Sat Dec 3 13:09:58 2011 +0100