[Pkg-freeipa-devel] pki: Changes to 'ubuntu'

[Timo Aaltonen]

New branch 'ubuntu' available with the following commits:
commit 081aa722f6f78d0c81d3875aa58b1d848114432e
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Sat Mar 17 14:27:35 2012 +0200

    release to ppa

commit 5b8a399f551748a0ee7cd3711a967f79af77aebb
Merge: 0030302 1f55241
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Sat Mar 17 14:25:23 2012 +0200

    Merge branch 'debian-unstable' into ubuntu
    
    Conflicts:
    	debian/changelog

commit 0030302b771103621cb0a4c7c9df9b05f41b8406
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Mar 16 23:05:26 2012 +0200

    release to precise

commit 0dca1e1df70baa3c5187320625a5cd48cc4628c7
Merge: 26171ac 3229134
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Mar 16 23:03:12 2012 +0200

    Merge branch 'debian-unstable' into ubuntu

commit 26171acbbe60f33399ffadd42dc7571a57472460
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Feb 20 14:12:14 2012 +0200

    new upload to the ppa

commit 4de13dee444c7ecf3c4c77d9014bc5f49858e9b5
Merge: 9a9acba 082e62e
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Feb 20 14:11:49 2012 +0200

    Merge branch 'debian-unstable' into ubuntu

commit 9a9acbaa66e143116a8ca2ad996ccd72e307b579
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Feb 20 10:23:06 2012 +0200

    new upload to the ppa

commit 39b954be58a8bf1140548274c94418f5217c474f
Merge: 115c6c4 37d6a29
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Feb 20 10:22:44 2012 +0200

    Merge branch 'debian-unstable' into ubuntu

commit 115c6c4d597a1b8348fa2fdf101433aadf6c18b4
Merge: 06eae51 3349da5
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Feb 20 02:37:45 2012 +0200

    Merge branch 'debian-unstable' into ubuntu

commit 06eae51597548ce6e779eeb6fb88b817c3506e44
Merge: 81c530b 11706f1
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Feb 20 02:33:31 2012 +0200

    Merge branch 'debian-unstable' into ubuntu

commit 81c530b39eb29320255f425779f4d063b1f25c60
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Feb 20 02:17:10 2012 +0200

    upload to a ppa