--- a/changelog	Mon Aug 09 19:58:48 2010 +0200
+++ b/changelog	Tue Aug 10 10:42:11 2010 +0200
@@ -5,6 +5,7 @@
 - added action to copy the editor path to the clipboard to the tab context menu
 - added code to adjust the cursor flash time of the editor to the global settings
 - added code to show hidden files in the various browsers
+- added an editor action to join the current line with the next one
 
 Version 5.1-snapshot-20100718:
 - bug fixes