Mercurial > luaevent-prosody / changelog

Merge remote branch 'jsnyder-tree/master'

• Sat, 15 Jan 2011 20:32:15 -0500
• by Thomas Harning Jr <harningt@gmail.com> [Sat, 15 Jan 2011 20:32:15 -0500] rev 102
• Merge remote branch 'jsnyder-tree/master'
  
  Conflicts:
  CHANGELOG
  Makefile
  README