Merge branch 'maint'

lisp/org-indent.el

@@ -1,5 +1,6 @@
 ;;; org-indent.el --- Dynamic indentation for Org    -*- lexical-binding: t; -*-
-;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
+
+;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp