Merge 0.9->trunk
authorWaqas Hussain <waqas20@gmail.com>
Sat, 22 Sep 2012 20:13:08 +0000 (01:13 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Sat, 22 Sep 2012 20:13:08 +0000 (01:13 +0500)
commitb1874e278503b55740a2b1826651dbf61bfaf753
treeda2353ceb8737133355abacf17f684b24eae3009
parent6925cdc57b9ad537a619f98c10234f3af4497408
parent9d5c27052a4ad68560fdca1f41c3e6dfd1309f54
Merge 0.9->trunk
prosodyctl