Merge branch 'plans' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 4 Jan 2013 09:23:36 +0000 (10:23 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 4 Jan 2013 09:23:36 +0000 (10:23 +0100)
commitfa0fc1bf55b423a401c98dff0cc0dcdb83136b8e
tree5091a6b05cef3e75c5f198528864b3010080988e
parent5df23a7accb0e82109898f02818c2f65a0bb7b91
parent5fdf75877fd22aed951678d92b291b3b7ca1926f
Merge branch 'plans' into maint

* plans:
  plans: add the "PLANS" directory

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Conflicts:
Makefile.am
Makefile.am