Merge branch 'master' into halfandquarter halfandquarter
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 23 Nov 2013 14:11:26 +0000 (15:11 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 23 Nov 2013 14:11:26 +0000 (15:11 +0100)
commita1e80351a81876d63caf7d37b1fc5ef465ed8f78
treef270bfca405d972c7760ca0d765ad9bcdf914f3d
parent1a0509856ccf28544058d42deccefeff0dbb7f95
parent96227576932fb912f4e2e2385b53c3a2e3546429
Merge branch 'master' into halfandquarter