Merge branch 'master' into i18n

Conflicts:
	plugins/gtkui/callbacks.c
	plugins/gtkui/prefwin.c

1 files changed, 1 insertions, 0 deletions

diff --git a/playlist.c b/playlist.c
index 47054e7e..04993d9d 100644
--- a/playlist.c
+++ b/playlist.c
@@ -2813,6 +2813,7 @@ pl_move_items (int iter, int plt_from, playItem_t *drop_before, uint32_t *indexe
             plt_remove_item (playlist, it);
             plt_insert_item (to, drop_after, it);
             pl_item_unref (it);
+            drop_after = it;
             processed++;
         }
     }