Merge branch 'master' into my_changes
authorThomas Spalinger <spali@github.com>
Tue, 25 Jun 2013 20:53:14 +0000 (22:53 +0200)
committerThomas Spalinger <spali@github.com>
Tue, 25 Jun 2013 20:53:14 +0000 (22:53 +0200)
commitca810b37c67eae10995df645327699d2fea4b3ef
tree47cf2824231de92c640a53f9dea4da1f9e54c10b
parent7b5d30ed18ada02e46dd65c01c66a8dbd5bfed77
parent18ee4cc6c9eb8d16becfec68254d8955eb10c7d5
Merge branch 'master' into my_changes