Merge remote-tracking branch 'tethera/master'
Manually resolved conflicts by db. Hope that works out.
Conflicts:
tags/
1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327725684-5887-2-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327725684-5887-2-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327725684-5887-2-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327725684-5887-3-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327725684-5887-3-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327725684-5887-3-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327725684-5887-4-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327725684-5887-4-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327725684-5887-4-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327725684-5887-5-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327725684-5887-5-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327725684-5887-5-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327725684-5887-6-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327725684-5887-6-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327725684-5887-6-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327727143-24455-1-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327727143-24455-1-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327727143-24455-1-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327730348-6466-1-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327730348-6466-1-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327730348-6466-1-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327730348-6466-2-git-send-email-dmitry.kurochkin@gmail.com/moreinfo
tags/
1327730348-6466-2-git-send-email-dmitry.kurochkin@gmail.com/needs-review
tags/
1327730348-6466-2-git-send-email-dmitry.kurochkin@gmail.com/obsolete
tags/
1327808163-31483-1-git-send-email-dmitry.kurochkin@gmail.com/needs-review