Merge branch 'master' into 0.11
[platform/upstream/gstreamer.git] / stamp.h.in
1 timestamp