Forward-merging changes from master
authorChris Glass <tribaal@gmail.com>
Thu, 26 Jun 2014 09:23:46 +0000 (11:23 +0200)
committerChris Glass <tribaal@gmail.com>
Thu, 26 Jun 2014 09:23:46 +0000 (11:23 +0200)
commit956f725b3527d4143fb4336b111e58ef0a031c76
tree5decd3cc1da1910ba9fdd7dc27fd1ca4d414db0d
parent34f0a65c49492ed62f399fd74aa25a6a4edcfc33
parent029e0b8b0d788463feb56cb34540d9dcc9f31e93
Forward-merging changes from master

To make sure tests pass or fail with the latest code.