Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:39:08 +0000 (10:39 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:39:08 +0000 (10:39 +0200)
commitd2d6ca6f98ccb4a7c51fc4f45882e2461df6e1fc
treee023e7e7fa13effc10efeef6840e60a6ef24d231
parent87ee98c89866696441f4c63dedc1323f52360902
parentd5eab59a5373b22aa52d6053a8e853e95a6e131e
Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'

* commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e':
  aac: Make sure to set err on the failure path

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>