[avrdude: 18/20] Merge branch 'f13'

[Hans Ulrich Niedermann]

commit 51d08850b5db9781189d4e1703c25803d520d817
Merge: 4e13503 ac84949
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Wed Mar 2 22:39:07 2011 +0100

    Merge branch 'f13'
    
    This fixes the sources and .gitignore in f14, f15, and rawhide
    to actually refer to the 5.10 release, not the 5.8 one. The f13
    branch was the only one which got that right.
    
    Conflicts:
    	.gitignore
    	avrdude.spec

 .gitignore |    2 +-
 sources    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---