From 7b3769da2a21ba5e19c2adc9c9807674548f3610 Mon Sep 17 00:00:00 2001
From: o9000 <mrovi9000@gmail.com>
Date: Mon, 9 May 2016 12:22:05 +0200
Subject: [PATCH] Update changelog

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0309796..e64957c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-09 master
+- Fixes:
+  - Fixed crash in tint2conf when adding background
+  - Add correct extension to file name in tint2conf for 'Save as'
+
 2016-05-07 0.12.10
 - Fixes:
   - Fixed crash in systray with non-Latin languagess (thanks zcodes)