Commit cfa7afa2 authored by Jordan Justen's avatar Jordan Justen

Merge branch 'maint-1.5' for debian changelog

Conflicts:
  debian/changelog
parents b8195f9b b32f4875
waffle (1.5.0-1) unstable; urgency=low
* New upstream release
-- Jordan Justen <jordan.l.justen@intel.com> Tue, 16 Dec 2014 11:06:19 -0800
waffle (1.5.0~rc1-1) unstable; urgency=low
* New upstream release candidate
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment