From: Andre Noll <maan@tuebingen.mpg.de>
Date: Fri, 30 Dec 2016 14:58:41 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/invalid-ids'
X-Git-Tag: v0.5.7~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;hp=121015ff5cdbe6af7b84f6245ebe62fe2a52a859

Merge branch 'refs/heads/t/invalid-ids'

A single patch that was in misc for a while, and two follow up fixups
that were detected after the branch was merged into next.

* refs/heads/t/invalid-ids (cooking for two weeks):
  Makefile: Don't compile with -Wformat-signedness unconditionally.
  aft.c: Use correct format string for error output.
  touch: Refuse to set an invalid image or lyrics ID.
---