[Commit-gnuradio] [gnuradio] 09/09: Merge branch 'maint' of git.gnuradio.org:gnuradio into maint

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch maint
in repository gnuradio.

commit aa4a33d58ecf518311e065085bddff3dfc169849
Merge: 835954a 1567cbc
Author: Tom Rondeau <address@hidden>
Date:   Fri Apr 25 12:44:03 2014 -0400

    Merge branch 'maint' of git.gnuradio.org:gnuradio into maint

 docs/doxygen/other/pmt.dox | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)