From a5ff345f7baeadd47144605ab14630c357124513 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 22 Sep 2015 10:45:55 +0200
Subject: [PATCH] fix another occurence of "macro" to "major"

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4b00fb5ea..d17d29def 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@
 - (experimental) adapt more SEMVER style versioning and change meaning of 
   master branch in git repo: "master" branch now keeps the bugfixes, changes 
   aimed for micro releases.  "features" branch will only be be released 
-  with minor or macro pytest releases.
+  with minor or major pytest releases.
 
 - Fix issue #766 by removing documentation references to distutils.
   Thanks Russel Winder.