tree 2374a1aff2deb735d6e6bba3dabd0a7877ff0733
parent e893ef237d130bc20f6f209017faa2450d53122a
parent 5445f362fd9ff2817de0772ef503db799a42fc62
author Sebastian Dröge <sebastian@centricular.com> 1384010543 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1384010543 +0100

Merge tag 'upstream/1.2.1'

Upstream version 1.2.1