Merge remote-tracking branch 'hsaito/master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Jul 2015 18:48:53 +0000 (20:48 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Jul 2015 18:48:53 +0000 (20:48 +0200)
commitfcd3a59e73209164daed5947cd58ff0918b947b8
tree052b7de61ec08090a22a56f729ea6db250337088
parent98efc01af1fdafeaf17c983d13cca0dedd9d9ba3
parent00bcacc72a5afba6fe59437d8bab8a5aab0ca118
Merge remote-tracking branch 'hsaito/master' into next