Merge remote branch 'upstream/master'

Conflicts:
	src/exif.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/exif.c b/src/exif.c
index 19b75f4..dcf2a88 100644
--- a/src/exif.c
+++ b/src/exif.c
@@ -230,7 +230,7 @@ void exif_get_info(ExifData * ed, char *buffer, unsigned int maxsize)
           exif_get_mnote_tag(ed, 132, buffer + strlen(buffer), maxsize - strlen(buffer));
           /* Digital Vari-Program */
           exif_get_mnote_tag(ed, 171, buffer + strlen(buffer), maxsize - strlen(buffer));
-          
+
         }
 
       }