Merge branch 'draft_r'
commitfa291e7e58bfe518577116125df5a47e86372002
authorLauri Tirkkonen <lotheac@iki.fi>
Wed, 8 Mar 2017 14:20:16 +0000 (8 16:20 +0200)
committerLauri Tirkkonen <lotheac@iki.fi>
Wed, 8 Mar 2017 14:20:16 +0000 (8 16:20 +0200)
tree9a8ad1b958c5a2da1b8deaa437ea74d148e4f057
parent726cdab75a9aff52e84c60e66217df33a0f54259
parent44270f06489728168dcc8c7039ca5b5420a3f121
Merge branch 'draft_r'