Merge branch 'irdan-irdan/doc-fix'

This commit is contained in:
irungentoo_trip 2014-10-26 18:13:14 -07:00
commit c136145647