Merge branch 'master' into halfandquarter
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 25 Oct 2013 20:59:54 +0000 (22:59 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 25 Oct 2013 20:59:54 +0000 (22:59 +0200)
commit1a0509856ccf28544058d42deccefeff0dbb7f95
treed9c4e9229267511d575012b5ae4b7ac1783bae36
parent1f52b1617d72cfa6909ebbfbdf7c264d487b28d8
parent8c9d65dd45edb85f5a48d0a5e1b28490c6c268fb
Merge branch 'master' into halfandquarter